Sat Apr 11 02:33:16 2015 UTC ()

Reduce diff from upstream a little.


(riastradh)

diff -r1.2 -r1.3 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c

--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c 2012/10/15 14:15:59	1.2
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c 2015/04/11 02:33:16	1.3

 @@ -480,31 +480,30 @@ zfs_range_lock(znode_t *zp, uint64_t off
 	new->r_type = type;
 	new->r_proxy = B_FALSE;
 	cv_init(&new->r_wr_cv, NULL, CV_DEFAULT, NULL);
 	cv_init(&new->r_rd_cv, NULL, CV_DEFAULT, NULL);
 	new->r_write_wanted = B_FALSE;
 	new->r_read_wanted = B_FALSE;
 	new->r_refcnt = 1;
 	mutex_enter(&zp->z_range_lock);
 	if (type == RL_READER) {
 		/*
 		 * First check for the usual case of no locks
 		 */
-		if (avl_numnodes(&zp->z_range_avl) == 0) {
+		if (avl_numnodes(&zp->z_range_avl) == 0)
 			avl_add(&zp->z_range_avl, new);
-		} else {
+		else
 			zfs_range_lock_reader(zp, new);
 	} else {
 		zfs_range_lock_writer(zp, new); /* RL_WRITER or RL_APPEND */
+	}
 	mutex_exit(&zp->z_range_lock);
 	return (new);
+}
 /*
  * Unlock a reader lock
  */
 static void
 zfs_range_unlock_reader(znode_t *zp, rl_t *remove)
+{