cvs commit: src/sys/kern vnode_if.src

[Jung-uk Kim]

On Monday 11 April 2005 03:22 pm, Doug Barton wrote:
> Jeff Roberson wrote:
> > jeff        2005-04-11 15:19:29 UTC
> >
> >   FreeBSD src repository
> >
> >   Modified files:
> >     sys/kern             vnode_if.src
> >   Log:
> >    - Mark the VOPs that require exclusive locks.  Those that
> > aren't marked with E may be called with a shared lock held.  This
> > list really could be made per filesystem if we had any
> > filesystems which differed from ffs in locking guarantees.  VFS
> > itself is not sensitive to this except where vgone() etc. are
> > concerned.
> >
> >   Sponsored by:   Isilon Systems, Inc.
> >
> >   Revision  Changes    Path
> >   1.77      +26 -26    src/sys/kern/vnode_if.src
> >
> > http://www.FreeBSD.org/cgi/cvsweb.cgi/src/sys/kern/vnode_if.src.d
> >iff?&r1=1.76&r2=1.77&f=h
>
> I now have a broken build:
>
> cc -c -O -pipe -march=pentium4m -Wall -Wredundant-decls
> -Wnested-externs -Wstric t-prototypes  -Wmissing-prototypes
> -Wpointer-arith -Winline -Wcast-qual  -fforma t-extensions -std=c99
> -g -nostdinc -I-  -I. -I/usr/local/src/sys -I/usr/local/sr
> c/sys/contrib/dev/acpica -I/usr/local/src/sys/contrib/altq
> -I/usr/local/src/sys/ contrib/ipfilter
> -I/usr/local/src/sys/contrib/pf -I/usr/local/src/sys/contrib/de
> v/ath -I/usr/local/src/sys/contrib/dev/ath/freebsd
> -I/usr/local/src/sys/contrib/ ngatm -D_KERNEL -include opt_global.h
> -fno-common -finline-limit=8000 --param in line-unit-growth=100
> --param large-function-growth=1000  -mno-align-long-strings
> -mpreferred-stack-boundary=2  -mno-mmx -mno-3dnow -mno-sse
> -mno-sse2 -ffreestan
> ding -Werror  vnode_if.c
> vnode_if.c: In function `VOP_CREATE_APV':
> vnode_if.c:205: warning: implicit declaration of function
> `ASSERT_VOP_ELOCKED' vnode_if.c:205: warning: nested extern
> declaration of `ASSERT_VOP_ELOCKED' vnode_if.c: In function
> `VOP_WHITEOUT_APV':
> vnode_if.c:261: warning: nested extern declaration of
> `ASSERT_VOP_ELOCKED' vnode_if.c:205: warning: redundant
> redeclaration of 'ASSERT_VOP_ELOCKED' vnode_if.c:205: warning:
> previous implicit declaration of 'ASSERT_VOP_ELOCKED' w as here
> vnode_if.c: In function `VOP_MKNOD_APV':
> vnode_if.c:315: warning: nested extern declaration of
> `ASSERT_VOP_ELOCKED' vnode_if.c:205: warning: redundant
> redeclaration of 'ASSERT_VOP_ELOCKED' vnode_if.c:205: warning:
> previous implicit declaration of 'ASSERT_VOP_ELOCKED' w as here
>
> and on and on.
>
> Doug

FYI, the following patch fixes it.

Jung-uk Kim

Index: vnode.h
===================================================================
RCS file: /home/ncvs/src/sys/sys/vnode.h,v
retrieving revision 1.296
diff -u -r1.296 vnode.h
--- src/sys/sys/vnode.h	11 Apr 2005 15:17:06 -0000	1.296
+++ src/sys/sys/vnode.h	11 Apr 2005 20:31:15 -0000
@@ -514,8 +514,8 @@
 
 #define	ASSERT_VI_LOCKED(vp, str)
 #define	ASSERT_VI_UNLOCKED(vp, str)
-#if 0
 #define	ASSERT_VOP_ELOCKED(vp, str)
+#if 0
 #define	ASSERT_VOP_ELOCKED_OTHER(vp, str)
 #endif
 #define	ASSERT_VOP_LOCKED(vp, str)