From owner-cvs-src-old@FreeBSD.ORG Sun Apr 17 23:04:26 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 B3FA0106566B for ; Sun, 17 Apr 2011 23:04:26 +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 A1FB58FC08 for ; Sun, 17 Apr 2011 23:04:26 +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 p3HN4Q30058522 for ; Sun, 17 Apr 2011 23:04:26 GMT (envelope-from rmacklem@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p3HN4Qrr058521 for cvs-src-old@freebsd.org; Sun, 17 Apr 2011 23:04:26 GMT (envelope-from rmacklem@repoman.freebsd.org) Message-Id: <201104172304.p3HN4Qrr058521@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to rmacklem@repoman.freebsd.org using -f From: Rick Macklem Date: Sun, 17 Apr 2011 23:04:03 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: HEAD Subject: cvs commit: src/sys/fs/nfsclient nfs_clrpcops.c nfs_clstate.c nfs_clvfsops.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: Sun, 17 Apr 2011 23:04:26 -0000 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