From owner-cvs-src-old@FreeBSD.ORG Wed Jul 13 17:10:38 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 A5067106564A for ; Wed, 13 Jul 2011 17:10:38 +0000 (UTC) (envelope-from sbruno@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 937C48FC0C for ; Wed, 13 Jul 2011 17:10:38 +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 p6DHAcnl013465 for ; Wed, 13 Jul 2011 17:10:38 GMT (envelope-from sbruno@repoman.freebsd.org) Received: (from svn2cvs@localhost) by repoman.freebsd.org (8.14.4/8.14.4/Submit) id p6DHAcub013464 for cvs-src-old@freebsd.org; Wed, 13 Jul 2011 17:10:38 GMT (envelope-from sbruno@repoman.freebsd.org) Message-Id: <201107131710.p6DHAcub013464@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: svn2cvs set sender to sbruno@repoman.freebsd.org using -f From: Sean Bruno Date: Wed, 13 Jul 2011 17:09:15 +0000 (UTC) To: cvs-src-old@freebsd.org X-FreeBSD-CVS-Branch: RELENG_7 Subject: cvs commit: src/sbin/umount umount.8 umount.c src/sys/nfsclient nfs_vfsops.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: Wed, 13 Jul 2011 17:10:38 -0000 sbruno 2011-07-13 17:09:15 UTC FreeBSD src repository Modified files: (Branch: RELENG_7) sbin/umount umount.8 umount.c sys/nfsclient nfs_vfsops.c Log: SVN rev 223982 on 2011-07-13 17:09:15Z by sbruno MFC r222541, r222464, r222466 Modify the umount(8) command so that it doesn't do a sync(2) syscall before unmount(2) for the "-f" case. This avoids a forced dismount from getting stuck for an NFS mountpoint in sync() when the server is not responsive. With this commit, forced dismounts should normally work for the NFS clients, but can take up to about 1minute to complete. Add a check for MNTK_UNMOUNTF at the beginning of nfs_sync() in the old NFS client so that a forced dismount doesn't get stuck in the VFS_SYNC() call that happens before VFS_UNMOUNT() in dounmount(). Analagous to r222329 for the new NFS client. An additional change is needed before forced dismounts will work. Add a sentence to the umount.8 man page to clarify the behaviour for forced dismount when used on an NFS mount point. Requested by Jeremy Chadwick. This is a content change Revision Changes Path 1.20.18.1 +4 -1 src/sbin/umount/umount.8 1.45.10.1 +3 -3 src/sbin/umount/umount.c 1.193.2.8 +10 -1 src/sys/nfsclient/nfs_vfsops.c