summaryrefslogtreecommitdiffstats
path: root/sys/nfsclient/nfs_socket.c
diff options
context:
space:
mode:
authorattilio <attilio@FreeBSD.org>2008-11-02 10:15:42 +0000
committerattilio <attilio@FreeBSD.org>2008-11-02 10:15:42 +0000
commite1f493235eaeaf3c0cd0e029936db2b5b6e32bf7 (patch)
tree904da44fc29dcc675df2dfc69f644d6a90befc3c /sys/nfsclient/nfs_socket.c
parent92bf4795aa726561a195b11458e9f2fc6ee74454 (diff)
downloadFreeBSD-src-e1f493235eaeaf3c0cd0e029936db2b5b6e32bf7.zip
FreeBSD-src-e1f493235eaeaf3c0cd0e029936db2b5b6e32bf7.tar.gz
Improve VFS locking:
- Implement real draining for vfs consumers by not relying on the mnt_lock and using instead a refcount in order to keep track of lock requesters. - Due to the change above, remove the mnt_lock lockmgr because it is now useless. - Due to the change above, vfs_busy() is no more linked to a lockmgr. Change so its KPI by removing the interlock argument and defining 2 new flags for it: MBF_NOWAIT which basically replaces the LK_NOWAIT of the old version (which was unlinked from the lockmgr alredy) and MBF_MNTLSTLOCK which provides the ability to drop the mountlist_mtx once the mnt interlock is held (ability still desired by most consumers). - The stub used into vfs_mount_destroy(), that allows to override the mnt_ref if running for more than 3 seconds, make it totally useless. Remove it as it was thought to work into older versions. If a problem of "refcount held never going away" should appear, we will need to fix properly instead than trust on such hackish solution. - Fix a bug where returning (with an error) from dounmount() was still leaving the MNTK_MWAIT flag on even if it the waiters were actually woken up. Just a place in vfs_mount_destroy() is left because it is going to recycle the structure in any case, so it doesn't matter. - Remove the markercnt refcount as it is useless. This patch modifies VFS ABI and breaks KPI for vfs_busy() so manpages and __FreeBSD_version will be modified accordingly. Discussed with: kib Tested by: pho
Diffstat (limited to 'sys/nfsclient/nfs_socket.c')
-rw-r--r--sys/nfsclient/nfs_socket.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/sys/nfsclient/nfs_socket.c b/sys/nfsclient/nfs_socket.c
index a2a0b14..179a93a 100644
--- a/sys/nfsclient/nfs_socket.c
+++ b/sys/nfsclient/nfs_socket.c
@@ -1429,8 +1429,8 @@ nfs_timer(void *arg)
/*
* Terminate request if force-unmount in progress.
* Note that NFS could have vfs_busy'ed the mount,
- * causing the unmount to wait for the mnt_lock, making
- * this bit of logic necessary.
+ * causing the unmount to wait and making this bit
+ * of logic necessary.
*/
if (rep->r_nmp->nm_mountp->mnt_kern_flag & MNTK_UNMOUNTF) {
nfs_softterm(rep);
OpenPOWER on IntegriCloud