Merge pull request openzfs#3 from b333z/issue-1561-morefixes

Code cleanups
b333z · May 27, 2013 · 1cb02c7 · 1cb02c7
2 parents c363fce + 8b7f16f
commit 1cb02c7
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 8 deletions.
diff --git a/META b/META
@@ -2,7 +2,7 @@ Meta:         1
 Name:         zfs
 Branch:       1.0
 Version:      0.6.1
-Release:      b333z-issue-1461 
+Release:      1
 Release-Tags: relext
 License:      CDDL
 Author:       Sun Microsystems/Oracle, Lawrence Livermore National Laboratory
diff --git a/module/zfs/vdev_mirror.c b/module/zfs/vdev_mirror.c
@@ -34,7 +34,6 @@
 #include <sys/fs/zfs.h>
 
 int zfs_vdev_mirror_pending_balance = 0;
-int zfs_vdev_mirror_pending_balance_debug = 0;
 
 /*
  * Virtual device vector for mirroring.
@@ -260,12 +259,9 @@ vdev_mirror_child_select(zio_t *zio)
 				pending_lowest_count = pending;
 				pending_lowest_child = c;
 			}
-			else if (pending == pending_lowest_count)
-			{
+			else if (pending == pending_lowest_count) {
 				if ( c == mm->mm_preferred)
-				{
 					pending_lowest_child = c;
-				}
 			}
 			continue;
 		}
@@ -279,9 +275,7 @@ vdev_mirror_child_select(zio_t *zio)
 	 * and return the child with smallest queue.
 	 */
 	if ( pending_lowest_child != -1 )
-	{
 		return (pending_lowest_child);
-	}
 
 	/*
 	 * Every device is either missing or has this txg in its DTL.