Module Name: src
Committed By: riastradh
Date: Sat Apr 11 02:33:16 UTC 2015
Modified Files:
src/external/cddl/osnet/dist/uts/common/fs/zfs: zfs_rlock.c
Log Message:
Reduce diff from upstream a little.
To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 \
src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c
diff -u src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c:1.2 src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c:1.3
--- src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c:1.2 Mon Oct 15 14:15:59 2012
+++ src/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c Sat Apr 11 02:33:16 2015
@@ -490,11 +490,10 @@ zfs_range_lock(znode_t *zp, uint64_t off
/*
* 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 */
}
