From owner-p4-projects@FreeBSD.ORG Thu Oct 8 14:01:45 2009 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 11710106568B; Thu, 8 Oct 2009 14:01:45 +0000 (UTC) Delivered-To: perforce@FreeBSD.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C95CC1065676 for ; Thu, 8 Oct 2009 14:01:44 +0000 (UTC) (envelope-from gk@FreeBSD.org) Received: from repoman.freebsd.org (repoman.freebsd.org [IPv6:2001:4f8:fff6::29]) by mx1.freebsd.org (Postfix) with ESMTP id 9E8488FC16 for ; Thu, 8 Oct 2009 14:01:44 +0000 (UTC) Received: from repoman.freebsd.org (localhost [127.0.0.1]) by repoman.freebsd.org (8.14.3/8.14.3) with ESMTP id n98E1ifx067520 for ; Thu, 8 Oct 2009 14:01:44 GMT (envelope-from gk@FreeBSD.org) Received: (from perforce@localhost) by repoman.freebsd.org (8.14.3/8.14.3/Submit) id n98E1iBq067518 for perforce@freebsd.org; Thu, 8 Oct 2009 14:01:44 GMT (envelope-from gk@FreeBSD.org) Date: Thu, 8 Oct 2009 14:01:44 GMT Message-Id: <200910081401.n98E1iBq067518@repoman.freebsd.org> X-Authentication-Warning: repoman.freebsd.org: perforce set sender to gk@FreeBSD.org using -f From: Gleb Kurtsou To: Perforce Change Reviews Cc: Subject: PERFORCE change 169323 for review X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 08 Oct 2009 14:01:45 -0000 http://perforce.freebsd.org/chv.cgi?CH=169323 Change 169323 by gk@gk_h1 on 2009/10/08 14:00:57 recursively lock root vnode if fs was mounted on the same dir (e.g. pefs mount ~/Private ~/Private) lock Giant if needed during async node free Affected files ... .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#14 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#14 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#13 edit .. //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#21 edit Differences ... ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs.h#14 (text+ko) ==== @@ -97,11 +97,14 @@ struct pefs_tkey pn_tkey; }; +#define PM_ROOT_CANRECURSE 0x01 + struct pefs_mount { struct mount *pm_lowervfs; struct vnode *pm_rootvp; /* Reference to root pefs_node */ struct mtx pm_keys_lock; struct pefs_key_head pm_keys; + int pm_flags; }; struct pefs_chunk { ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_subr.c#14 (text+ko) ==== @@ -469,6 +469,7 @@ { struct pefs_node *pn; struct vnode *lowervp; + int vfslocked = 0; while (1) { mtx_lock(&pefs_node_listmtx); @@ -481,9 +482,13 @@ mtx_unlock(&pefs_node_listmtx); lowervp = pn->pn_lowervp_dead; uma_zfree(pefs_node_zone, pn); - if (lowervp != NULL) + if (lowervp != NULL) { + if (!vfslocked) + vfslocked = VFS_LOCK_GIANT(lowervp->v_mount); vrele(lowervp); + } } + VFS_UNLOCK_GIANT(vfslocked); } /* ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vfsops.c#13 (text+ko) ==== @@ -134,6 +134,8 @@ * Save reference to underlying FS */ pm->pm_lowervfs = lowerrootvp->v_mount; + if (lowerrootvp == mp->mnt_vnodecovered) + pm->pm_flags |= PM_ROOT_CANRECURSE; /* * Save reference. Each mount also holds ==== //depot/projects/soc2009/gk_pefs/sys/fs/pefs/pefs_vnops.c#21 (text+ko) ==== @@ -891,6 +891,7 @@ { struct vnode *vp = ap->a_vp; int flags = ap->a_flags; + struct pefs_mount *pm; struct pefs_node *pn; struct vnode *lvp; int error; @@ -907,6 +908,13 @@ * vop lock. */ if (pn != NULL && (lvp = pn->pn_lowervp) != NULL) { + if (vp->v_mount != NULL) { + pm = VFS_TO_PEFS(vp->v_mount); + if (pm != NULL && + (pm->pm_flags & PM_ROOT_CANRECURSE) && + pm->pm_rootvp == vp) + ap->a_flags = flags |= LK_CANRECURSE; + } VI_LOCK_FLAGS(lvp, MTX_DUPOK); VI_UNLOCK(vp); /*