From owner-cvs-src-old@FreeBSD.ORG Fri May 27 22:05:31 2011 Return-Path: Delivered-To: cvs-src-old@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 2D7AA10657C4 for ; Fri, 27 May 2011 22:05:31 +0000 (UTC) (envelope-from rmacklem@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 1B0368FC08 for ; Fri, 27 May 2011 22:05:31 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.4/8.14.4) with ESMTP id p4RM5U3m027084 for ; Fri, 27 May 2011 22:05:30 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p4RM5UaB027083 for cvs-src-old@freebsd.org; Fri, 27 May 2011 22:05:30 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201105272205.p4RM5UaB027083@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Fri, 27 May 2011 22:05:10 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD 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 X-BeenThere: cvs-src-old@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: **OBSOLETE** CVS commit messages for the src tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 27 May 2011 22:05:31 -0000 rmacklem 2011-05-27 22:05:10 UTC FreeBSD src repository Modified files: 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 222389 on 2011-05-27 22:05:10Z by rmacklem 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. MFC after: 2 weeks Revision Changes Path 1.12 +16 -3 src/sys/fs/nfs/nfs_commonsubs.c 1.29 +2 -2 src/sys/fs/nfs/nfs_var.h 1.4 +1 -1 src/sys/fs/nfsclient/nfs_clcomsubs.c 1.23 +78 -16 src/sys/fs/nfsclient/nfs_clstate.c 1.13 +3 -3 src/sys/fs/nfsserver/nfs_nfsdsocket.c 1.32 +9 -9 src/sys/fs/nfsserver/nfs_nfsdstate.c