Date: Sun, 17 Apr 2011 23:04:03 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/fs/nfsclient nfs_clrpcops.c nfs_clstate.c nfs_clvfsops.c Message-ID: <201104172304.p3HN4Qrr058521@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rmacklem 2011-04-17 23:04:03 UTC
FreeBSD src repository
Modified files:
sys/fs/nfsclient nfs_clrpcops.c nfs_clstate.c
nfs_clvfsops.c
Log:
SVN rev 220761 on 2011-04-17 23:04:03Z by rmacklem
Add checks for MNTK_UNMOUNTF at the beginning of three
functions, so that threads don't get stuck in them during
a forced dismount. nfs_sync/VFS_SYNC() needs this, since it is
called by dounmount() before VFS_UNMOUNT(). The nfscl_nget()
case makes sure that a thread doing an VOP_OPEN() or
VOP_ADVLOCK() call doesn't get blocked before attempting
the RPC. Attempting RPCs don't block, since they all
fail once a forced dismount is in progress.
The third one at the beginning of nfsrpc_close()
is done so threads don't get blocked while doing VOP_INACTIVE()
as the vnodes are cleared out.
With these three changes plus a change to the umount(1)
command so that it doesn't do "sync()" for the forced case
seem to make forced dismounts work for the experimental NFS
client.
MFC after: 2 weeks
Revision Changes Path
1.19 +5 -0 src/sys/fs/nfsclient/nfs_clrpcops.c
1.21 +4 -0 src/sys/fs/nfsclient/nfs_clstate.c
1.19 +4 -0 src/sys/fs/nfsclient/nfs_clvfsops.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201104172304.p3HN4Qrr058521>