cvs commit: src/sys/coda coda_vnops.c coda_vnops.h src/sys/fs/nullfs null_vnops.c src/sys/kern vfs_default.c vfs_subr.c vfs_vnops.c vnode_if.src src/sys/sys vnode.h src/sys/ufs/ffs ffs_vnops.c

[Kip Macy]

We can call it something else, but fundamentally it has to be wrapped
by a macro - this is the convention for locks. You can change it to
vop_lock_internal if you like. I

On 11/13/06, Pawel Jakub Dawidek <pjd at freebsd.org> wrote:
> On Mon, Nov 13, 2006 at 05:51:22AM +0000, Kip Macy wrote:
> > kmacy       2006-11-13 05:51:22 UTC
> >
> >   FreeBSD src repository
> >
> >   Modified files:
> >     sys/coda             coda_vnops.c coda_vnops.h
> >     sys/fs/nullfs        null_vnops.c
> >     sys/kern             vfs_default.c vfs_subr.c vfs_vnops.c
> >                          vnode_if.src
> >     sys/sys              vnode.h
> >     sys/ufs/ffs          ffs_vnops.c
> >   Log:
> >   change vop_lock handling to allowing tracking of callers' file and line
> for
> >   acquisition of lockmgr locks
> [...]
> > --- src/sys/coda/coda_vnops.c	2006/02/01 00:25:24	1.68
> > +++ src/sys/coda/coda_vnops.c	2006/11/13 05:51:21	1.69
> [...]
> >      .vop_reclaim = coda_reclaim,	/* reclaim */
> > -    .vop_lock = coda_lock,		/* lock */
> > +    ._vop_lock = coda_lock,		/* lock */
> >      .vop_unlock = coda_unlock,		/* unlock */
> [...]
> > --- src/sys/fs/nullfs/null_vnops.c	2006/03/12 04:58:18	1.91
> > +++ src/sys/fs/nullfs/null_vnops.c	2006/11/13 05:51:21	1.92
> [...]
> >  	.vop_islocked =		null_islocked,
> > -	.vop_lock =		null_lock,
> > +	._vop_lock =		null_lock,
> >  	.vop_lookup =		null_lookup,
> [...]
> > --- src/sys/kern/vfs_default.c	2006/09/20 00:27:02	1.134
> > +++ src/sys/kern/vfs_default.c	2006/11/13 05:51:22	1.135
> [...]
> >  	.vop_lease =		VOP_NULL,
> > -	.vop_lock =		vop_stdlock,
> > +	._vop_lock =		vop_stdlock,
> >  	.vop_lookup =		vop_nolookup,
> [...]
> > --- src/sys/kern/vfs_subr.c	2006/11/07 19:45:05	1.691
> > +++ src/sys/kern/vfs_subr.c	2006/11/13 05:51:22	1.692
> [...]
> >  	.vop_reclaim =	sync_reclaim,	/* reclaim */
> > -	.vop_lock =	vop_stdlock,	/* lock */
> > +	._vop_lock =	vop_stdlock,	/* lock */
> >  	.vop_unlock =	vop_stdunlock,	/* unlock */
> > --- src/sys/ufs/ffs/ffs_vnops.c	2006/11/06 13:42:09	1.162
> > +++ src/sys/ufs/ffs/ffs_vnops.c	2006/11/13 05:51:22	1.163
> [...]
> >  	.vop_getpages =		ffs_getpages,
> > -	.vop_lock =		ffs_lock,
> > +	._vop_lock =		ffs_lock,
> >  	.vop_read =		ffs_read,
> [...]
> >  	.vop_getpages =		ffs_getpages,
> > -	.vop_lock =		ffs_lock,
> > +	._vop_lock =		ffs_lock,
> >  	.vop_read =		ffs_read,
> [...]
> >  	.vop_fsync =		ffs_fsync,
> > -	.vop_lock =		ffs_lock,
> > +	._vop_lock =		ffs_lock,
> >  	.vop_reallocblks =	ffs_reallocblks,
>
> Kip... This is so ugly... All the rest of vops don'y have this _ prefix.
> There is really no other way to implement it?
>
> --
> Pawel Jakub Dawidek                       http://www.wheel.pl
> pjd at FreeBSD.org                           http://www.FreeBSD.org
> FreeBSD committer                         Am I Evil? Yes, I Am!
>
>