From owner-svn-src-all@FreeBSD.ORG Thu Apr 21 10:33:06 2011 Return-Path: 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 AA7D11065679; Thu, 21 Apr 2011 10:33:06 +0000 (UTC) (envelope-from kostikbel@gmail.com) Received: from mail.zoral.com.ua (mx0.zoral.com.ua [91.193.166.200]) by mx1.freebsd.org (Postfix) with ESMTP id 044EE8FC15; Thu, 21 Apr 2011 10:33:05 +0000 (UTC) Received: from deviant.kiev.zoral.com.ua (root@deviant.kiev.zoral.com.ua [10.1.1.148]) by mail.zoral.com.ua (8.14.2/8.14.2) with ESMTP id p3LAX0ef074344 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Thu, 21 Apr 2011 13:33:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: from deviant.kiev.zoral.com.ua (kostik@localhost [127.0.0.1]) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4) with ESMTP id p3LAX0KG004987; Thu, 21 Apr 2011 13:33:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) Received: (from kostik@localhost) by deviant.kiev.zoral.com.ua (8.14.4/8.14.4/Submit) id p3LAX0R2004986; Thu, 21 Apr 2011 13:33:00 +0300 (EEST) (envelope-from kostikbel@gmail.com) X-Authentication-Warning: deviant.kiev.zoral.com.ua: kostik set sender to kostikbel@gmail.com using -f Date: Thu, 21 Apr 2011 13:33:00 +0300 From: Kostik Belousov To: Rick Macklem Message-ID: <20110421103300.GK48734@deviant.kiev.zoral.com.ua> References: <201104202325.p3KNPIK6070781@svn.freebsd.org> Mime-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha1; protocol="application/pgp-signature"; boundary="b/6gol1SqNxk8K3i" Content-Disposition: inline In-Reply-To: <201104202325.p3KNPIK6070781@svn.freebsd.org> User-Agent: Mutt/1.4.2.3i X-Virus-Scanned: clamav-milter 0.95.2 at skuns.kiev.zoral.com.ua X-Virus-Status: Clean X-Spam-Status: No, score=-3.4 required=5.0 tests=ALL_TRUSTED,AWL,BAYES_00, DNS_FROM_OPENWHOIS autolearn=no version=3.2.5 X-Spam-Checker-Version: SpamAssassin 3.2.5 (2008-06-10) on skuns.kiev.zoral.com.ua Cc: svn-src-head@freebsd.org, svn-src-all@freebsd.org, src-committers@freebsd.org Subject: Re: 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 " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 21 Apr 2011 10:33:06 -0000 --b/6gol1SqNxk8K3i Content-Type: text/plain; charset=us-ascii Content-Disposition: inline Content-Transfer-Encoding: quoted-printable On Wed, Apr 20, 2011 at 11:25:18PM +0000, Rick Macklem wrote: > Author: rmacklem > Date: Wed Apr 20 23:25:18 2011 > New Revision: 220906 > URL: http://svn.freebsd.org/changeset/base/220906 >=20 > 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. > =20 > MFC after: 2 weeks >=20 > Modified: > head/sys/fs/nfsclient/nfs_clport.c >=20 > Modified: head/sys/fs/nfsclient/nfs_clport.c > =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D > --- 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; > =20 > + if ((vp->v_iflag & VI_DOOMED) !=3D 0) > + return (EPERM); > nmp =3D VFSTONFS(vp->v_mount); > if (nd->nd_flag & ND_NFSV4) > vers =3D NFS_VER4; Is vnode lock held at this point ? If yes, I suggest to add ASSERT_VOP_{E,}LOCKED() assertion both to enforce the invariant, and to document the state to readers of the code. --b/6gol1SqNxk8K3i Content-Type: application/pgp-signature Content-Disposition: inline -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (FreeBSD) iEYEARECAAYFAk2wB9wACgkQC3+MBN1Mb4i/BgCfSMLXRIF9fwGgyDx6Kth+eSdf Ja8AoM2Ec7eNjJrSMf8y8cPbvwNOPLAM =AzcF -----END PGP SIGNATURE----- --b/6gol1SqNxk8K3i--