Mercurial > illumos > illumos-gate

diff usr/src/uts/common/fs/zfs/zfs_rlock.c @ 13765:9410cf539b11

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
backout 3006: causes 3046 (panics after mounting root)
author Richard Lowe <richlowe@richlowe.net>
date Wed, 01 Aug 2012 16:40:39 -0400
parents 38b4aca480b3
children e3a9ae14a119
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/zfs_rlock.c	Tue Jul 31 06:38:31 2012 -0700
+++ b/usr/src/uts/common/fs/zfs/zfs_rlock.c	Wed Aug 01 16:40:39 2012 -0400
@@ -24,12 +24,6 @@
  */
 
 /*
- * Copyright (c) 2012 by Delphix. All rights reserved.
- */
-
-
-
-/*
  * This file contains the code to implement file range locking in
  * ZFS, although there isn't much specific to ZFS (all that comes to mind
  * support for growing the blocksize).
@@ -487,9 +481,9 @@
 			cv_destroy(&remove->r_rd_cv);
 		}
 	} else {
-		ASSERT0(remove->r_cnt);
-		ASSERT0(remove->r_write_wanted);
-		ASSERT0(remove->r_read_wanted);
+		ASSERT3U(remove->r_cnt, ==, 0);
+		ASSERT3U(remove->r_write_wanted, ==, 0);
+		ASSERT3U(remove->r_read_wanted, ==, 0);
 		/*
 		 * Find start proxy representing this reader lock,
 		 * then decrement ref count on all proxies