Mercurial > illumos > illumos-gate

changeset 10896:007ca67ca400

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
6793877 lockd can block ZFS force-unmounting on behalf of clients
author Mark Shellenbaum <Mark.Shellenbaum@Sun.COM>
date Wed, 28 Oct 2009 09:43:07 -0600
parents 275ef2b47915
children 553c746933b9
files usr/src/uts/common/fs/zfs/zfs_vnops.c
diffstat 1 files changed, 1 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/usr/src/uts/common/fs/zfs/zfs_vnops.c	Wed Oct 28 08:26:01 2009 -0700
+++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c	Wed Oct 28 09:43:07 2009 -0600
@@ -4007,7 +4007,6 @@
 {
 	znode_t *zp = VTOZ(vp);
 	zfsvfs_t *zfsvfs = zp->z_zfsvfs;
-	int error;
 
 	ZFS_ENTER(zfsvfs);
 	ZFS_VERIFY_ZP(zp);
@@ -4022,9 +4021,8 @@
 		ZFS_EXIT(zfsvfs);
 		return (EAGAIN);
 	}
-	error = fs_frlock(vp, cmd, bfp, flag, offset, flk_cbp, cr, ct);
 	ZFS_EXIT(zfsvfs);
-	return (error);
+	return (fs_frlock(vp, cmd, bfp, flag, offset, flk_cbp, cr, ct));
 }
 
 /*