From owner-svn-src-all@FreeBSD.ORG Mon Jul 28 01:16:08 2014 Return-Path: Delivered-To: svn-src-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 0169D999; Mon, 28 Jul 2014 01:16:08 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::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 E3D6A2D74; Mon, 28 Jul 2014 01:16:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id s6S1G75I015287; Mon, 28 Jul 2014 01:16:07 GMT (envelope-from kib@svn.freebsd.org) Received: (from kib@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id s6S1G7Vx015286; Mon, 28 Jul 2014 01:16:07 GMT (envelope-from kib@svn.freebsd.org) Message-Id: <201407280116.s6S1G7Vx015286@svn.freebsd.org> From: Konstantin Belousov Date: Mon, 28 Jul 2014 01:16:07 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org Subject: svn commit: r269173 - stable/10/sys/fs/tmpfs X-SVN-Group: stable-10 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.18 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: Mon, 28 Jul 2014 01:16:08 -0000 Author: kib Date: Mon Jul 28 01:16:07 2014 New Revision: 269173 URL: http://svnweb.freebsd.org/changeset/base/269173 Log: MFC r268614: Use tmpfs_vn_get_ino_gen() to handle the races with reclaim in tmpfs dotdot lookup. Modified: stable/10/sys/fs/tmpfs/tmpfs_vnops.c Directory Properties: stable/10/ (props changed) Modified: stable/10/sys/fs/tmpfs/tmpfs_vnops.c ============================================================================== --- stable/10/sys/fs/tmpfs/tmpfs_vnops.c Mon Jul 28 01:14:25 2014 (r269172) +++ stable/10/sys/fs/tmpfs/tmpfs_vnops.c Mon Jul 28 01:16:07 2014 (r269173) @@ -69,15 +69,22 @@ SYSCTL_INT(_vfs_tmpfs, OID_AUTO, rename_ "Times rename had to restart due to lock contention"); static int +tmpfs_vn_get_ino_alloc(struct mount *mp, void *arg, int lkflags, + struct vnode **rvp) +{ + + return (tmpfs_alloc_vp(mp, arg, lkflags, rvp)); +} + +static int tmpfs_lookup(struct vop_cachedlookup_args *v) { struct vnode *dvp = v->a_dvp; struct vnode **vpp = v->a_vpp; struct componentname *cnp = v->a_cnp; - - int error; struct tmpfs_dirent *de; struct tmpfs_node *dnode; + int error; dnode = VP_TO_TMPFS_DIR(dvp); *vpp = NULLVP; @@ -98,17 +105,10 @@ tmpfs_lookup(struct vop_cachedlookup_arg goto out; } if (cnp->cn_flags & ISDOTDOT) { - int ltype = 0; - - ltype = VOP_ISLOCKED(dvp); - vhold(dvp); - VOP_UNLOCK(dvp, 0); - /* Allocate a new vnode on the matching entry. */ - error = tmpfs_alloc_vp(dvp->v_mount, dnode->tn_dir.tn_parent, - cnp->cn_lkflags, vpp); - - vn_lock(dvp, ltype | LK_RETRY); - vdrop(dvp); + error = vn_vget_ino_gen(dvp, tmpfs_vn_get_ino_alloc, + dnode->tn_dir.tn_parent, cnp->cn_lkflags, vpp); + if (error != 0) + goto out; } else if (cnp->cn_namelen == 1 && cnp->cn_nameptr[0] == '.') { VREF(dvp); *vpp = dvp;