d/freebsd-skq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

ZFS: Fix a panic while unmounting a busy filesystem.

Browse Source 
This particular scenario was easily reproduced using a NFS export.  When the
first 'zfs unmount' occurred, it returned EBUSY via this path, while
vflush() had flushed references on the filesystem's root vnode, which in
turn caused its v_interlock to be destroyed.  The next time 'zfs unmount'
was called, vflush() tried to obtain this lock, which caused this panic.

Since vflush() on FreeBSD is a definitive call, there is no need to check
vfsp->vfs_count after it completes.  Simply #ifdef sun this check.

Submitted by:	avg
Reviewed by:	avg
Approved by:	ken (mentor)
MFC after:	1 month
This commit is contained in:
Will Andrews 2013-03-23 16:34:56 +00:00
parent fdbc71742b
commit 58567a1b4e
1 changed files with 2 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sys/cddl/contrib/opensolaris/uts/common/fs/zfs/zfs_vfsops.c
View File

@ -1968,6 +1968,7 @@ zfs_umount(vfs_t *vfsp, int fflag)
return (ret);
}
#ifdef sun
if (!(fflag & MS_FORCE)) {
/*
* Check the number of active vnodes in the file system.
@ -1988,6 +1989,7 @@ zfs_umount(vfs_t *vfsp, int fflag)
return (EBUSY);
}
}
#endif
VERIFY(zfsvfs_teardown(zfsvfs, B_TRUE) == 0);
os = zfsvfs->z_os;