From owner-svn-src-all@FreeBSD.ORG  Wed Apr 20 23:25:18 2011
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 8FFDA1065673;
	Wed, 20 Apr 2011 23:25:18 +0000 (UTC)
	(envelope-from rmacklem@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id 7EF468FC13;
	Wed, 20 Apr 2011 23:25:18 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id p3KNPItL070783;
	Wed, 20 Apr 2011 23:25:18 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Received: (from rmacklem@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id p3KNPIK6070781;
	Wed, 20 Apr 2011 23:25:18 GMT
	(envelope-from rmacklem@svn.freebsd.org)
Message-Id: <201104202325.p3KNPIK6070781@svn.freebsd.org>
From: Rick Macklem <rmacklem@FreeBSD.org>
Date: Wed, 20 Apr 2011 23:25:18 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r220906 - head/sys/fs/nfsclient
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 20 Apr 2011 23:25:18 -0000

Author: rmacklem
Date: Wed Apr 20 23:25:18 2011
New Revision: 220906
URL: http://svn.freebsd.org/changeset/base/220906

Log:
  Add a check for VI_DOOMED at the beginning of nfscl_request()
  so that it won't try and use vp->v_mount to do an RPC during
  a forced dismount. There needs to be at least one more kernel
  commit, plus a change to the umount(8) command before forced
  dismounts will work for the experimental NFS client.
  
  MFC after:	2 weeks

Modified:
  head/sys/fs/nfsclient/nfs_clport.c

Modified: head/sys/fs/nfsclient/nfs_clport.c
==============================================================================
--- head/sys/fs/nfsclient/nfs_clport.c	Wed Apr 20 23:20:00 2011	(r220905)
+++ head/sys/fs/nfsclient/nfs_clport.c	Wed Apr 20 23:25:18 2011	(r220906)
@@ -819,6 +819,8 @@ nfscl_request(struct nfsrv_descript *nd,
 	int ret, vers;
 	struct nfsmount *nmp;
 
+	if ((vp->v_iflag & VI_DOOMED) != 0)
+		return (EPERM);
 	nmp = VFSTONFS(vp->v_mount);
 	if (nd->nd_flag & ND_NFSV4)
 		vers = NFS_VER4;