diff options
| author | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2009-10-28 09:43:07 -0600 |
|---|---|---|
| committer | Mark Shellenbaum <Mark.Shellenbaum@Sun.COM> | 2009-10-28 09:43:07 -0600 |
| commit | 04ce3d0b99f323222197d013257f04d5c65e2d61 (patch) | |
| tree | 7353747c3c68e4a884fca9f2305e6a3182847edb | |
| parent | 4b8b26d47e34e2dc4405d1dfc9b02a884e12c91a (diff) | |
| download | illumos-joyent-04ce3d0b99f323222197d013257f04d5c65e2d61.tar.gz | |
6793877 lockd can block ZFS force-unmounting on behalf of clients
| -rw-r--r-- | usr/src/uts/common/fs/zfs/zfs_vnops.c | 4 |
1 files changed, 1 insertions, 3 deletions
diff --git a/usr/src/uts/common/fs/zfs/zfs_vnops.c b/usr/src/uts/common/fs/zfs/zfs_vnops.c index 08bd0d378b..0f5f91c6bd 100644 --- a/usr/src/uts/common/fs/zfs/zfs_vnops.c +++ b/usr/src/uts/common/fs/zfs/zfs_vnops.c @@ -4007,7 +4007,6 @@ zfs_frlock(vnode_t *vp, int cmd, flock64_t *bfp, int flag, offset_t offset, { 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_frlock(vnode_t *vp, int cmd, flock64_t *bfp, int flag, offset_t offset, 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)); } /* |