Date: Fri, 10 Jun 2011 13:28:14 +0000 (UTC) From: Rick Macklem <rmacklem@FreeBSD.org> To: cvs-src-old@freebsd.org Subject: cvs commit: src/sys/fs/nfs nfs_commonsubs.c nfs_var.h src/sys/fs/nfsclient nfs_clcomsubs.c nfs_clstate.c src/sys/fs/nfsserver nfs_nfsdsocket.c nfs_nfsdstate.c Message-ID: <201106101328.p5ADSXmZ011688@repoman.freebsd.org>
next in thread | raw e-mail | index | archive | help
rmacklem 2011-06-10 13:28:14 UTC
FreeBSD src repository
Modified files: (Branch: RELENG_8)
sys/fs/nfs nfs_commonsubs.c nfs_var.h
sys/fs/nfsclient nfs_clcomsubs.c nfs_clstate.c
sys/fs/nfsserver nfs_nfsdsocket.c nfs_nfsdstate.c
Log:
SVN rev 222931 on 2011-06-10 13:28:14Z by rmacklem
MFC: r222389
Fix the new NFS client so that it handles NFSv4 state
correctly during a forced dismount. This required that
the exclusive and shared (refcnt) sleep lock functions check
for MNTK_UMOUNTF before sleeping, so that they won't block
while nfscl_umount() is getting rid of the state. As
such, a "struct mount *" argument was added to the locking
functions. I believe the only remaining case where a forced
dismount can get hung in the kernel is when a thread is
already attempting to do a TCP connect to a dead server
when the krpc client structure called nr_client is NULL.
This will only happen just after a "mount -u" with options
that force a new TCP connection is done, so it shouldn't
be a problem in practice.
Revision Changes Path
1.3.2.10 +16 -3 src/sys/fs/nfs/nfs_commonsubs.c
1.6.2.24 +2 -2 src/sys/fs/nfs/nfs_var.h
1.1.2.4 +1 -1 src/sys/fs/nfsclient/nfs_clcomsubs.c
1.7.2.15 +78 -16 src/sys/fs/nfsclient/nfs_clstate.c
1.4.2.10 +3 -3 src/sys/fs/nfsserver/nfs_nfsdsocket.c
1.10.2.23 +9 -9 src/sys/fs/nfsserver/nfs_nfsdstate.c
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201106101328.p5ADSXmZ011688>