Date: Mon, 19 Nov 2012 11:32:56 +0000 (UTC) From: Andriy Gapon <avg@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r243271 - head/sys/kern Message-ID: <201211191132.qAJBWuDA044048@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: avg Date: Mon Nov 19 11:32:56 2012 New Revision: 243271 URL: http://svnweb.freebsd.org/changeset/base/243271 Log: vnode_if: fix locking protocol description for lookup and cachedlookup Also remove the checks from vop_lookup_pre and vop_lookup_post, which are now completely redundant (before this change they were partially redundant). Discussed with: kib MFC after: 10 days Modified: head/sys/kern/vfs_subr.c head/sys/kern/vnode_if.src Modified: head/sys/kern/vfs_subr.c ============================================================================== --- head/sys/kern/vfs_subr.c Mon Nov 19 11:30:08 2012 (r243270) +++ head/sys/kern/vfs_subr.c Mon Nov 19 11:32:56 2012 (r243271) @@ -4104,35 +4104,11 @@ vop_strategy_pre(void *ap) void vop_lookup_pre(void *ap) { -#ifdef DEBUG_VFS_LOCKS - struct vop_lookup_args *a; - struct vnode *dvp; - - a = ap; - dvp = a->a_dvp; - ASSERT_VI_UNLOCKED(dvp, "VOP_LOOKUP"); - ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP"); -#endif } void vop_lookup_post(void *ap, int rc) { -#ifdef DEBUG_VFS_LOCKS - struct vop_lookup_args *a; - struct vnode *dvp; - struct vnode *vp; - - a = ap; - dvp = a->a_dvp; - vp = *(a->a_vpp); - - ASSERT_VI_UNLOCKED(dvp, "VOP_LOOKUP"); - ASSERT_VOP_LOCKED(dvp, "VOP_LOOKUP"); - - if (!rc) - ASSERT_VOP_LOCKED(vp, "VOP_LOOKUP (child)"); -#endif } void Modified: head/sys/kern/vnode_if.src ============================================================================== --- head/sys/kern/vnode_if.src Mon Nov 19 11:30:08 2012 (r243270) +++ head/sys/kern/vnode_if.src Mon Nov 19 11:32:56 2012 (r243271) @@ -63,7 +63,7 @@ vop_islocked { IN struct vnode *vp; }; -%% lookup dvp L ? ? +%% lookup dvp L L L %% lookup vpp - L - %! lookup pre vop_lookup_pre %! lookup post vop_lookup_post @@ -78,7 +78,7 @@ vop_lookup { IN struct componentname *cnp; }; -%% cachedlookup dvp L ? ? +%% cachedlookup dvp L L L %% cachedlookup vpp - L - # This must be an exact copy of lookup. See kern/vfs_cache.c for details.
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201211191132.qAJBWuDA044048>