From owner-svn-src-head@freebsd.org Sun Jun 26 14:18:30 2016 Return-Path: Delivered-To: svn-src-head@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 26384B812FC; Sun, 26 Jun 2016 14:18:30 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D1A502BAF; Sun, 26 Jun 2016 14:18:29 +0000 (UTC) (envelope-from kib@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id u5QEIT9B002963; Sun, 26 Jun 2016 14:18:29 GMT (envelope-from kib@FreeBSD.org) Received: (from kib@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id u5QEITxu002962; Sun, 26 Jun 2016 14:18:29 GMT (envelope-from kib@FreeBSD.org) Message-Id: <201606261418.u5QEITxu002962@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: kib set sender to kib@FreeBSD.org using -f From: Konstantin Belousov Date: Sun, 26 Jun 2016 14:18:29 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r302210 - head/sys/fs/nfsclient X-SVN-Group: head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-head@freebsd.org X-Mailman-Version: 2.1.22 Precedence: list List-Id: SVN commit messages for the src tree for head/-current List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 26 Jun 2016 14:18:30 -0000 Author: kib Date: Sun Jun 26 14:18:28 2016 New Revision: 302210 URL: https://svnweb.freebsd.org/changeset/base/302210 Log: Clean other flags in ncl_inactive, only. Add comment explaining why other flags should be unset. Suggested and reviewed by: rmacklem Sponsored by: The FreeBSD Foundation MFC after: 12 days Approved by: re (gjb) Modified: head/sys/fs/nfsclient/nfs_clnode.c Modified: head/sys/fs/nfsclient/nfs_clnode.c ============================================================================== --- head/sys/fs/nfsclient/nfs_clnode.c Sun Jun 26 13:18:03 2016 (r302209) +++ head/sys/fs/nfsclient/nfs_clnode.c Sun Jun 26 14:18:28 2016 (r302210) @@ -206,7 +206,7 @@ ncl_releasesillyrename(struct vnode *vp, ASSERT_VOP_ELOCKED(vp, "releasesillyrename"); np = VTONFS(vp); - mtx_lock(&np->n_mtx); + mtx_assert(&np->n_mtx, MA_OWNED); if (vp->v_type != VDIR) { sp = np->n_sillyrename; np->n_sillyrename = NULL; @@ -224,14 +224,13 @@ ncl_releasesillyrename(struct vnode *vp, taskqueue_enqueue(taskqueue_thread, &sp->s_task); mtx_lock(&np->n_mtx); } - np->n_flag &= NMODIFIED; - mtx_unlock(&np->n_mtx); } int ncl_inactive(struct vop_inactive_args *ap) { struct vnode *vp = ap->a_vp; + struct nfsnode *np; boolean_t retv; if (NFS_ISV4(vp) && vp->v_type == VREG) { @@ -254,7 +253,17 @@ ncl_inactive(struct vop_inactive_args *a } } + np = VTONFS(vp); + mtx_lock(&np->n_mtx); ncl_releasesillyrename(vp, ap->a_td); + + /* + * NMODIFIED means that there might be dirty/stale buffers + * associated with the NFS vnode. None of the other flags are + * meaningful after the vnode is unused. + */ + np->n_flag &= NMODIFIED; + mtx_unlock(&np->n_mtx); return (0); } @@ -275,7 +284,9 @@ ncl_reclaim(struct vop_reclaim_args *ap) if (nfs_reclaim_p != NULL) nfs_reclaim_p(ap); + mtx_lock(&np->n_mtx); ncl_releasesillyrename(vp, ap->a_td); + mtx_unlock(&np->n_mtx); /* * Destroy the vm object and flush associated pages.