Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/trunk]: src/external/cddl/osnet/dist/uts/common/fs/zfs Reduce diff from ...



details:   https://anonhg.NetBSD.org/src/rev/99a1014263b4
branches:  trunk
changeset: 337316:99a1014263b4
user:      riastradh <riastradh%NetBSD.org@localhost>
date:      Sat Apr 11 02:33:16 2015 +0000

description:
Reduce diff from upstream a little.

diffstat:

 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (17 lines):

diff -r 42a6f41f9c6a -r 99a1014263b4 external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c
--- a/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c    Sat Apr 11 01:49:00 2015 +0000
+++ b/external/cddl/osnet/dist/uts/common/fs/zfs/zfs_rlock.c    Sat Apr 11 02:33:16 2015 +0000
@@ -490,11 +490,10 @@
                /*
                 * 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 */
        }



Home | Main Index | Thread Index | Old Index