Mercurial > illumos > illumos-gate
diff usr/src/uts/common/fs/zfs/zfs_dir.c @ 13765:9410cf539b11
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 | d7059eb1884c |
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/zfs_dir.c Tue Jul 31 06:38:31 2012 -0700 +++ b/usr/src/uts/common/fs/zfs/zfs_dir.c Wed Aug 01 16:40:39 2012 -0400 @@ -20,7 +20,6 @@ */ /* * Copyright (c) 2005, 2010, Oracle and/or its affiliates. All rights reserved. - * Copyright (c) 2012 by Delphix. All rights reserved. */ #include <sys/types.h> @@ -455,8 +454,8 @@ ASSERT(zp->z_unlinked); ASSERT(zp->z_links == 0); - VERIFY0(zap_add_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj, - zp->z_id, tx)); + VERIFY3U(0, ==, + zap_add_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj, zp->z_id, tx)); } /* @@ -672,8 +671,8 @@ } /* Remove this znode from the unlinked set */ - VERIFY0(zap_remove_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj, - xzp->z_id, tx)); + VERIFY3U(0, ==, + zap_remove_int(zfsvfs->z_os, zfsvfs->z_unlinkedobj, zp->z_id, tx)); zfs_znode_delete(zp, tx);