diff options
Diffstat (limited to 'sys')
| -rw-r--r-- | sys/kern/vnode_if.c | 5 | ||||
| -rw-r--r-- | sys/sys/vnode_if.h | 336 |
2 files changed, 198 insertions, 143 deletions
diff --git a/sys/kern/vnode_if.c b/sys/kern/vnode_if.c index fb9ad91de03..0b8064cfd8b 100644 --- a/sys/kern/vnode_if.c +++ b/sys/kern/vnode_if.c @@ -3,9 +3,9 @@ * (Modifications made here may easily be lost!) * * Created from the file: - * OpenBSD: vnode_if.src,v 1.8 1998/08/08 03:53:30 csapuntz Exp + * OpenBSD: vnode_if.src,v 1.9 1998/12/05 16:54:02 csapuntz Exp * by the script: - * OpenBSD: vnode_if.sh,v 1.3 1996/04/19 16:09:13 niklas Exp + * OpenBSD: vnode_if.sh,v 1.5 1999/03/03 14:23:19 deraadt Exp */ /* @@ -41,6 +41,7 @@ * SUCH DAMAGE. */ +#define INTERNAL_VOP_NOT_INLINE #include <sys/param.h> #include <sys/mount.h> #include <sys/vnode.h> diff --git a/sys/sys/vnode_if.h b/sys/sys/vnode_if.h index 2a64bd4118f..732ead71952 100644 --- a/sys/sys/vnode_if.h +++ b/sys/sys/vnode_if.h @@ -3,9 +3,9 @@ * (Modifications made here may easily be lost!) * * Created from the file: - * OpenBSD: vnode_if.src,v 1.8 1998/08/08 03:53:30 csapuntz Exp + * OpenBSD: vnode_if.src,v 1.9 1998/12/05 16:54:02 csapuntz Exp * by the script: - * OpenBSD: vnode_if.sh,v 1.3 1996/04/19 16:09:13 niklas Exp + * OpenBSD: vnode_if.sh,v 1.5 1999/03/03 14:23:19 deraadt Exp */ /* @@ -44,14 +44,26 @@ extern struct vnodeop_desc vop_default_desc; #include "systm.h" +#ifdef VOP_NOT_INLINE +#define STATIC_INLINE +#else +#define STATIC_INLINE static __inline +#endif +#ifdef INTERNAL_VOP_NOT_INLINE +#define FUNC_STATIC_INLINE +#else +#undef FUNC_STATIC_INLINE +#define FUNC_STATIC_INLINE static __inline +#endif struct vop_islocked_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; }; extern struct vnodeop_desc vop_islocked_desc; -static __inline int VOP_ISLOCKED __P((struct vnode *)); -static __inline int VOP_ISLOCKED(vp) +STATIC_INLINE int VOP_ISLOCKED __P((struct vnode *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_ISLOCKED(vp) struct vnode *vp; { struct vop_islocked_args a; @@ -59,7 +71,7 @@ static __inline int VOP_ISLOCKED(vp) a.a_vp = vp; return (VCALL(vp, VOFFSET(vop_islocked), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_lookup_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -67,9 +79,10 @@ struct vop_lookup_args { struct componentname *a_cnp; }; extern struct vnodeop_desc vop_lookup_desc; -static __inline int VOP_LOOKUP __P((struct vnode *, struct vnode **, +STATIC_INLINE int VOP_LOOKUP __P((struct vnode *, struct vnode **, struct componentname *)); -static __inline int VOP_LOOKUP(dvp, vpp, cnp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_LOOKUP(dvp, vpp, cnp) struct vnode *dvp; struct vnode **vpp; struct componentname *cnp; @@ -81,7 +94,7 @@ static __inline int VOP_LOOKUP(dvp, vpp, cnp) a.a_cnp = cnp; return (VCALL(dvp, VOFFSET(vop_lookup), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_create_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -90,9 +103,10 @@ struct vop_create_args { struct vattr *a_vap; }; extern struct vnodeop_desc vop_create_desc; -static __inline int VOP_CREATE __P((struct vnode *, struct vnode **, +STATIC_INLINE int VOP_CREATE __P((struct vnode *, struct vnode **, struct componentname *, struct vattr *)); -static __inline int VOP_CREATE(dvp, vpp, cnp, vap) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_CREATE(dvp, vpp, cnp, vap) struct vnode *dvp; struct vnode **vpp; struct componentname *cnp; @@ -109,7 +123,7 @@ static __inline int VOP_CREATE(dvp, vpp, cnp, vap) a.a_vap = vap; return (VCALL(dvp, VOFFSET(vop_create), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_mknod_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -118,9 +132,10 @@ struct vop_mknod_args { struct vattr *a_vap; }; extern struct vnodeop_desc vop_mknod_desc; -static __inline int VOP_MKNOD __P((struct vnode *, struct vnode **, +STATIC_INLINE int VOP_MKNOD __P((struct vnode *, struct vnode **, struct componentname *, struct vattr *)); -static __inline int VOP_MKNOD(dvp, vpp, cnp, vap) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_MKNOD(dvp, vpp, cnp, vap) struct vnode *dvp; struct vnode **vpp; struct componentname *cnp; @@ -137,7 +152,7 @@ static __inline int VOP_MKNOD(dvp, vpp, cnp, vap) a.a_vap = vap; return (VCALL(dvp, VOFFSET(vop_mknod), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_open_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -146,9 +161,10 @@ struct vop_open_args { struct proc *a_p; }; extern struct vnodeop_desc vop_open_desc; -static __inline int VOP_OPEN __P((struct vnode *, int, struct ucred *, +STATIC_INLINE int VOP_OPEN __P((struct vnode *, int, struct ucred *, struct proc *)); -static __inline int VOP_OPEN(vp, mode, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_OPEN(vp, mode, cred, p) struct vnode *vp; int mode; struct ucred *cred; @@ -162,7 +178,7 @@ static __inline int VOP_OPEN(vp, mode, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_open), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_close_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -171,9 +187,10 @@ struct vop_close_args { struct proc *a_p; }; extern struct vnodeop_desc vop_close_desc; -static __inline int VOP_CLOSE __P((struct vnode *, int, struct ucred *, +STATIC_INLINE int VOP_CLOSE __P((struct vnode *, int, struct ucred *, struct proc *)); -static __inline int VOP_CLOSE(vp, fflag, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_CLOSE(vp, fflag, cred, p) struct vnode *vp; int fflag; struct ucred *cred; @@ -187,7 +204,7 @@ static __inline int VOP_CLOSE(vp, fflag, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_close), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_access_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -196,9 +213,10 @@ struct vop_access_args { struct proc *a_p; }; extern struct vnodeop_desc vop_access_desc; -static __inline int VOP_ACCESS __P((struct vnode *, int, struct ucred *, +STATIC_INLINE int VOP_ACCESS __P((struct vnode *, int, struct ucred *, struct proc *)); -static __inline int VOP_ACCESS(vp, mode, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_ACCESS(vp, mode, cred, p) struct vnode *vp; int mode; struct ucred *cred; @@ -215,7 +233,7 @@ static __inline int VOP_ACCESS(vp, mode, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_access), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_getattr_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -224,9 +242,10 @@ struct vop_getattr_args { struct proc *a_p; }; extern struct vnodeop_desc vop_getattr_desc; -static __inline int VOP_GETATTR __P((struct vnode *, struct vattr *, +STATIC_INLINE int VOP_GETATTR __P((struct vnode *, struct vattr *, struct ucred *, struct proc *)); -static __inline int VOP_GETATTR(vp, vap, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_GETATTR(vp, vap, cred, p) struct vnode *vp; struct vattr *vap; struct ucred *cred; @@ -240,7 +259,7 @@ static __inline int VOP_GETATTR(vp, vap, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_getattr), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_setattr_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -249,9 +268,10 @@ struct vop_setattr_args { struct proc *a_p; }; extern struct vnodeop_desc vop_setattr_desc; -static __inline int VOP_SETATTR __P((struct vnode *, struct vattr *, +STATIC_INLINE int VOP_SETATTR __P((struct vnode *, struct vattr *, struct ucred *, struct proc *)); -static __inline int VOP_SETATTR(vp, vap, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_SETATTR(vp, vap, cred, p) struct vnode *vp; struct vattr *vap; struct ucred *cred; @@ -268,7 +288,7 @@ static __inline int VOP_SETATTR(vp, vap, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_setattr), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_read_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -277,9 +297,10 @@ struct vop_read_args { struct ucred *a_cred; }; extern struct vnodeop_desc vop_read_desc; -static __inline int VOP_READ __P((struct vnode *, struct uio *, int, +STATIC_INLINE int VOP_READ __P((struct vnode *, struct uio *, int, struct ucred *)); -static __inline int VOP_READ(vp, uio, ioflag, cred) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_READ(vp, uio, ioflag, cred) struct vnode *vp; struct uio *uio; int ioflag; @@ -296,7 +317,7 @@ static __inline int VOP_READ(vp, uio, ioflag, cred) a.a_cred = cred; return (VCALL(vp, VOFFSET(vop_read), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_write_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -305,9 +326,10 @@ struct vop_write_args { struct ucred *a_cred; }; extern struct vnodeop_desc vop_write_desc; -static __inline int VOP_WRITE __P((struct vnode *, struct uio *, int, +STATIC_INLINE int VOP_WRITE __P((struct vnode *, struct uio *, int, struct ucred *)); -static __inline int VOP_WRITE(vp, uio, ioflag, cred) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_WRITE(vp, uio, ioflag, cred) struct vnode *vp; struct uio *uio; int ioflag; @@ -324,7 +346,7 @@ static __inline int VOP_WRITE(vp, uio, ioflag, cred) a.a_cred = cred; return (VCALL(vp, VOFFSET(vop_write), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_lease_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -333,9 +355,10 @@ struct vop_lease_args { int a_flag; }; extern struct vnodeop_desc vop_lease_desc; -static __inline int VOP_LEASE __P((struct vnode *, struct proc *, +STATIC_INLINE int VOP_LEASE __P((struct vnode *, struct proc *, struct ucred *, int)); -static __inline int VOP_LEASE(vp, p, cred, flag) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_LEASE(vp, p, cred, flag) struct vnode *vp; struct proc *p; struct ucred *cred; @@ -349,7 +372,7 @@ static __inline int VOP_LEASE(vp, p, cred, flag) a.a_flag = flag; return (VCALL(vp, VOFFSET(vop_lease), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_ioctl_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -360,9 +383,10 @@ struct vop_ioctl_args { struct proc *a_p; }; extern struct vnodeop_desc vop_ioctl_desc; -static __inline int VOP_IOCTL __P((struct vnode *, u_long, caddr_t, int, +STATIC_INLINE int VOP_IOCTL __P((struct vnode *, u_long, caddr_t, int, struct ucred *, struct proc *)); -static __inline int VOP_IOCTL(vp, command, data, fflag, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_IOCTL(vp, command, data, fflag, cred, p) struct vnode *vp; u_long command; caddr_t data; @@ -380,7 +404,7 @@ static __inline int VOP_IOCTL(vp, command, data, fflag, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_ioctl), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_select_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -390,9 +414,10 @@ struct vop_select_args { struct proc *a_p; }; extern struct vnodeop_desc vop_select_desc; -static __inline int VOP_SELECT __P((struct vnode *, int, int, - struct ucred *, struct proc *)); -static __inline int VOP_SELECT(vp, which, fflags, cred, p) +STATIC_INLINE int VOP_SELECT __P((struct vnode *, int, int, struct ucred *, + struct proc *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_SELECT(vp, which, fflags, cred, p) struct vnode *vp; int which; int fflags; @@ -408,15 +433,16 @@ static __inline int VOP_SELECT(vp, which, fflags, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_select), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_revoke_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; int a_flags; }; extern struct vnodeop_desc vop_revoke_desc; -static __inline int VOP_REVOKE __P((struct vnode *, int)); -static __inline int VOP_REVOKE(vp, flags) +STATIC_INLINE int VOP_REVOKE __P((struct vnode *, int)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_REVOKE(vp, flags) struct vnode *vp; int flags; { @@ -426,7 +452,7 @@ static __inline int VOP_REVOKE(vp, flags) a.a_flags = flags; return (VCALL(vp, VOFFSET(vop_revoke), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_mmap_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -435,9 +461,10 @@ struct vop_mmap_args { struct proc *a_p; }; extern struct vnodeop_desc vop_mmap_desc; -static __inline int VOP_MMAP __P((struct vnode *, int, struct ucred *, +STATIC_INLINE int VOP_MMAP __P((struct vnode *, int, struct ucred *, struct proc *)); -static __inline int VOP_MMAP(vp, fflags, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_MMAP(vp, fflags, cred, p) struct vnode *vp; int fflags; struct ucred *cred; @@ -451,7 +478,7 @@ static __inline int VOP_MMAP(vp, fflags, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_mmap), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_fsync_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -460,9 +487,10 @@ struct vop_fsync_args { struct proc *a_p; }; extern struct vnodeop_desc vop_fsync_desc; -static __inline int VOP_FSYNC __P((struct vnode *, struct ucred *, int, +STATIC_INLINE int VOP_FSYNC __P((struct vnode *, struct ucred *, int, struct proc *)); -static __inline int VOP_FSYNC(vp, cred, waitfor, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_FSYNC(vp, cred, waitfor, p) struct vnode *vp; struct ucred *cred; int waitfor; @@ -479,7 +507,7 @@ static __inline int VOP_FSYNC(vp, cred, waitfor, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_fsync), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_seek_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -488,9 +516,9 @@ struct vop_seek_args { struct ucred *a_cred; }; extern struct vnodeop_desc vop_seek_desc; -static __inline int VOP_SEEK __P((struct vnode *, off_t, off_t, - struct ucred *)); -static __inline int VOP_SEEK(vp, oldoff, newoff, cred) +STATIC_INLINE int VOP_SEEK __P((struct vnode *, off_t, off_t, struct ucred *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_SEEK(vp, oldoff, newoff, cred) struct vnode *vp; off_t oldoff; off_t newoff; @@ -504,7 +532,7 @@ static __inline int VOP_SEEK(vp, oldoff, newoff, cred) a.a_cred = cred; return (VCALL(vp, VOFFSET(vop_seek), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_remove_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -512,9 +540,10 @@ struct vop_remove_args { struct componentname *a_cnp; }; extern struct vnodeop_desc vop_remove_desc; -static __inline int VOP_REMOVE __P((struct vnode *, struct vnode *, +STATIC_INLINE int VOP_REMOVE __P((struct vnode *, struct vnode *, struct componentname *)); -static __inline int VOP_REMOVE(dvp, vp, cnp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_REMOVE(dvp, vp, cnp) struct vnode *dvp; struct vnode *vp; struct componentname *cnp; @@ -532,7 +561,7 @@ static __inline int VOP_REMOVE(dvp, vp, cnp) a.a_cnp = cnp; return (VCALL(dvp, VOFFSET(vop_remove), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_link_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -540,9 +569,10 @@ struct vop_link_args { struct componentname *a_cnp; }; extern struct vnodeop_desc vop_link_desc; -static __inline int VOP_LINK __P((struct vnode *, struct vnode *, +STATIC_INLINE int VOP_LINK __P((struct vnode *, struct vnode *, struct componentname *)); -static __inline int VOP_LINK(dvp, vp, cnp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_LINK(dvp, vp, cnp) struct vnode *dvp; struct vnode *vp; struct componentname *cnp; @@ -557,7 +587,7 @@ static __inline int VOP_LINK(dvp, vp, cnp) a.a_cnp = cnp; return (VCALL(dvp, VOFFSET(vop_link), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_rename_args { struct vnodeop_desc *a_desc; struct vnode *a_fdvp; @@ -568,10 +598,11 @@ struct vop_rename_args { struct componentname *a_tcnp; }; extern struct vnodeop_desc vop_rename_desc; -static __inline int VOP_RENAME __P((struct vnode *, struct vnode *, +STATIC_INLINE int VOP_RENAME __P((struct vnode *, struct vnode *, struct componentname *, struct vnode *, struct vnode *, struct componentname *)); -static __inline int VOP_RENAME(fdvp, fvp, fcnp, tdvp, tvp, tcnp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_RENAME(fdvp, fvp, fcnp, tdvp, tvp, tcnp) struct vnode *fdvp; struct vnode *fvp; struct componentname *fcnp; @@ -592,7 +623,7 @@ static __inline int VOP_RENAME(fdvp, fvp, fcnp, tdvp, tvp, tcnp) a.a_tcnp = tcnp; return (VCALL(fdvp, VOFFSET(vop_rename), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_mkdir_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -601,9 +632,10 @@ struct vop_mkdir_args { struct vattr *a_vap; }; extern struct vnodeop_desc vop_mkdir_desc; -static __inline int VOP_MKDIR __P((struct vnode *, struct vnode **, +STATIC_INLINE int VOP_MKDIR __P((struct vnode *, struct vnode **, struct componentname *, struct vattr *)); -static __inline int VOP_MKDIR(dvp, vpp, cnp, vap) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_MKDIR(dvp, vpp, cnp, vap) struct vnode *dvp; struct vnode **vpp; struct componentname *cnp; @@ -620,7 +652,7 @@ static __inline int VOP_MKDIR(dvp, vpp, cnp, vap) a.a_vap = vap; return (VCALL(dvp, VOFFSET(vop_mkdir), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_rmdir_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -628,9 +660,10 @@ struct vop_rmdir_args { struct componentname *a_cnp; }; extern struct vnodeop_desc vop_rmdir_desc; -static __inline int VOP_RMDIR __P((struct vnode *, struct vnode *, +STATIC_INLINE int VOP_RMDIR __P((struct vnode *, struct vnode *, struct componentname *)); -static __inline int VOP_RMDIR(dvp, vp, cnp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_RMDIR(dvp, vp, cnp) struct vnode *dvp; struct vnode *vp; struct componentname *cnp; @@ -648,7 +681,7 @@ static __inline int VOP_RMDIR(dvp, vp, cnp) a.a_cnp = cnp; return (VCALL(dvp, VOFFSET(vop_rmdir), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_symlink_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -658,9 +691,10 @@ struct vop_symlink_args { char *a_target; }; extern struct vnodeop_desc vop_symlink_desc; -static __inline int VOP_SYMLINK __P((struct vnode *, struct vnode **, +STATIC_INLINE int VOP_SYMLINK __P((struct vnode *, struct vnode **, struct componentname *, struct vattr *, char *)); -static __inline int VOP_SYMLINK(dvp, vpp, cnp, vap, target) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_SYMLINK(dvp, vpp, cnp, vap, target) struct vnode *dvp; struct vnode **vpp; struct componentname *cnp; @@ -679,7 +713,7 @@ static __inline int VOP_SYMLINK(dvp, vpp, cnp, vap, target) a.a_target = target; return (VCALL(dvp, VOFFSET(vop_symlink), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_readdir_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -690,9 +724,10 @@ struct vop_readdir_args { u_long **a_cookies; }; extern struct vnodeop_desc vop_readdir_desc; -static __inline int VOP_READDIR __P((struct vnode *, struct uio *, +STATIC_INLINE int VOP_READDIR __P((struct vnode *, struct uio *, struct ucred *, int *, int *, u_long **)); -static __inline int VOP_READDIR(vp, uio, cred, eofflag, ncookies, cookies) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_READDIR(vp, uio, cred, eofflag, ncookies, cookies) struct vnode *vp; struct uio *uio; struct ucred *cred; @@ -713,7 +748,7 @@ static __inline int VOP_READDIR(vp, uio, cred, eofflag, ncookies, cookies) a.a_cookies = cookies; return (VCALL(vp, VOFFSET(vop_readdir), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_readlink_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -721,9 +756,10 @@ struct vop_readlink_args { struct ucred *a_cred; }; extern struct vnodeop_desc vop_readlink_desc; -static __inline int VOP_READLINK __P((struct vnode *, struct uio *, +STATIC_INLINE int VOP_READLINK __P((struct vnode *, struct uio *, struct ucred *)); -static __inline int VOP_READLINK(vp, uio, cred) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_READLINK(vp, uio, cred) struct vnode *vp; struct uio *uio; struct ucred *cred; @@ -738,15 +774,16 @@ static __inline int VOP_READLINK(vp, uio, cred) a.a_cred = cred; return (VCALL(vp, VOFFSET(vop_readlink), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_abortop_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; struct componentname *a_cnp; }; extern struct vnodeop_desc vop_abortop_desc; -static __inline int VOP_ABORTOP __P((struct vnode *, struct componentname *)); -static __inline int VOP_ABORTOP(dvp, cnp) +STATIC_INLINE int VOP_ABORTOP __P((struct vnode *, struct componentname *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_ABORTOP(dvp, cnp) struct vnode *dvp; struct componentname *cnp; { @@ -756,15 +793,16 @@ static __inline int VOP_ABORTOP(dvp, cnp) a.a_cnp = cnp; return (VCALL(dvp, VOFFSET(vop_abortop), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_inactive_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; struct proc *a_p; }; extern struct vnodeop_desc vop_inactive_desc; -static __inline int VOP_INACTIVE __P((struct vnode *, struct proc *)); -static __inline int VOP_INACTIVE(vp, p) +STATIC_INLINE int VOP_INACTIVE __P((struct vnode *, struct proc *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_INACTIVE(vp, p) struct vnode *vp; struct proc *p; { @@ -777,15 +815,16 @@ static __inline int VOP_INACTIVE(vp, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_inactive), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_reclaim_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; struct proc *a_p; }; extern struct vnodeop_desc vop_reclaim_desc; -static __inline int VOP_RECLAIM __P((struct vnode *, struct proc *)); -static __inline int VOP_RECLAIM(vp, p) +STATIC_INLINE int VOP_RECLAIM __P((struct vnode *, struct proc *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_RECLAIM(vp, p) struct vnode *vp; struct proc *p; { @@ -795,7 +834,7 @@ static __inline int VOP_RECLAIM(vp, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_reclaim), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_lock_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -803,8 +842,9 @@ struct vop_lock_args { struct proc *a_p; }; extern struct vnodeop_desc vop_lock_desc; -static __inline int VOP_LOCK __P((struct vnode *, int, struct proc *)); -static __inline int VOP_LOCK(vp, flags, p) +STATIC_INLINE int VOP_LOCK __P((struct vnode *, int, struct proc *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_LOCK(vp, flags, p) struct vnode *vp; int flags; struct proc *p; @@ -816,7 +856,7 @@ static __inline int VOP_LOCK(vp, flags, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_lock), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_unlock_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -824,8 +864,9 @@ struct vop_unlock_args { struct proc *a_p; }; extern struct vnodeop_desc vop_unlock_desc; -static __inline int VOP_UNLOCK __P((struct vnode *, int, struct proc *)); -static __inline int VOP_UNLOCK(vp, flags, p) +STATIC_INLINE int VOP_UNLOCK __P((struct vnode *, int, struct proc *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_UNLOCK(vp, flags, p) struct vnode *vp; int flags; struct proc *p; @@ -837,7 +878,7 @@ static __inline int VOP_UNLOCK(vp, flags, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_unlock), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_bmap_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -847,9 +888,10 @@ struct vop_bmap_args { int *a_runp; }; extern struct vnodeop_desc vop_bmap_desc; -static __inline int VOP_BMAP __P((struct vnode *, daddr_t, struct vnode **, +STATIC_INLINE int VOP_BMAP __P((struct vnode *, daddr_t, struct vnode **, daddr_t *, int *)); -static __inline int VOP_BMAP(vp, bn, vpp, bnp, runp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_BMAP(vp, bn, vpp, bnp, runp) struct vnode *vp; daddr_t bn; struct vnode **vpp; @@ -868,14 +910,15 @@ static __inline int VOP_BMAP(vp, bn, vpp, bnp, runp) a.a_runp = runp; return (VCALL(vp, VOFFSET(vop_bmap), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_print_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; }; extern struct vnodeop_desc vop_print_desc; -static __inline int VOP_PRINT __P((struct vnode *)); -static __inline int VOP_PRINT(vp) +STATIC_INLINE int VOP_PRINT __P((struct vnode *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_PRINT(vp) struct vnode *vp; { struct vop_print_args a; @@ -883,7 +926,7 @@ static __inline int VOP_PRINT(vp) a.a_vp = vp; return (VCALL(vp, VOFFSET(vop_print), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_pathconf_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -891,8 +934,9 @@ struct vop_pathconf_args { register_t *a_retval; }; extern struct vnodeop_desc vop_pathconf_desc; -static __inline int VOP_PATHCONF __P((struct vnode *, int, register_t *)); -static __inline int VOP_PATHCONF(vp, name, retval) +STATIC_INLINE int VOP_PATHCONF __P((struct vnode *, int, register_t *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_PATHCONF(vp, name, retval) struct vnode *vp; int name; register_t *retval; @@ -904,7 +948,7 @@ static __inline int VOP_PATHCONF(vp, name, retval) a.a_retval = retval; return (VCALL(vp, VOFFSET(vop_pathconf), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_advlock_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -914,9 +958,10 @@ struct vop_advlock_args { int a_flags; }; extern struct vnodeop_desc vop_advlock_desc; -static __inline int VOP_ADVLOCK __P((struct vnode *, caddr_t, int, +STATIC_INLINE int VOP_ADVLOCK __P((struct vnode *, caddr_t, int, struct flock *, int)); -static __inline int VOP_ADVLOCK(vp, id, op, fl, flags) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_ADVLOCK(vp, id, op, fl, flags) struct vnode *vp; caddr_t id; int op; @@ -932,7 +977,7 @@ static __inline int VOP_ADVLOCK(vp, id, op, fl, flags) a.a_flags = flags; return (VCALL(vp, VOFFSET(vop_advlock), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_blkatoff_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -941,9 +986,10 @@ struct vop_blkatoff_args { struct buf **a_bpp; }; extern struct vnodeop_desc vop_blkatoff_desc; -static __inline int VOP_BLKATOFF __P((struct vnode *, off_t, char **, +STATIC_INLINE int VOP_BLKATOFF __P((struct vnode *, off_t, char **, struct buf **)); -static __inline int VOP_BLKATOFF(vp, offset, res, bpp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_BLKATOFF(vp, offset, res, bpp) struct vnode *vp; off_t offset; char **res; @@ -960,7 +1006,7 @@ static __inline int VOP_BLKATOFF(vp, offset, res, bpp) a.a_bpp = bpp; return (VCALL(vp, VOFFSET(vop_blkatoff), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_valloc_args { struct vnodeop_desc *a_desc; struct vnode *a_pvp; @@ -969,9 +1015,10 @@ struct vop_valloc_args { struct vnode **a_vpp; }; extern struct vnodeop_desc vop_valloc_desc; -static __inline int VOP_VALLOC __P((struct vnode *, int, struct ucred *, +STATIC_INLINE int VOP_VALLOC __P((struct vnode *, int, struct ucred *, struct vnode **)); -static __inline int VOP_VALLOC(pvp, mode, cred, vpp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_VALLOC(pvp, mode, cred, vpp) struct vnode *pvp; int mode; struct ucred *cred; @@ -988,7 +1035,7 @@ static __inline int VOP_VALLOC(pvp, mode, cred, vpp) a.a_vpp = vpp; return (VCALL(pvp, VOFFSET(vop_valloc), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_balloc_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -999,9 +1046,10 @@ struct vop_balloc_args { struct buf **a_bpp; }; extern struct vnodeop_desc vop_balloc_desc; -static __inline int VOP_BALLOC __P((struct vnode *, off_t, int, +STATIC_INLINE int VOP_BALLOC __P((struct vnode *, off_t, int, struct ucred *, int, struct buf **)); -static __inline int VOP_BALLOC(vp, startoffset, size, cred, flags, bpp) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_BALLOC(vp, startoffset, size, cred, flags, bpp) struct vnode *vp; off_t startoffset; int size; @@ -1022,16 +1070,16 @@ static __inline int VOP_BALLOC(vp, startoffset, size, cred, flags, bpp) a.a_bpp = bpp; return (VCALL(vp, VOFFSET(vop_balloc), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_reallocblks_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; struct cluster_save *a_buflist; }; extern struct vnodeop_desc vop_reallocblks_desc; -static __inline int VOP_REALLOCBLKS __P((struct vnode *, - struct cluster_save *)); -static __inline int VOP_REALLOCBLKS(vp, buflist) +STATIC_INLINE int VOP_REALLOCBLKS __P((struct vnode *, struct cluster_save *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_REALLOCBLKS(vp, buflist) struct vnode *vp; struct cluster_save *buflist; { @@ -1044,7 +1092,7 @@ static __inline int VOP_REALLOCBLKS(vp, buflist) a.a_buflist = buflist; return (VCALL(vp, VOFFSET(vop_reallocblks), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_vfree_args { struct vnodeop_desc *a_desc; struct vnode *a_pvp; @@ -1052,8 +1100,9 @@ struct vop_vfree_args { int a_mode; }; extern struct vnodeop_desc vop_vfree_desc; -static __inline int VOP_VFREE __P((struct vnode *, ino_t, int)); -static __inline int VOP_VFREE(pvp, ino, mode) +STATIC_INLINE int VOP_VFREE __P((struct vnode *, ino_t, int)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_VFREE(pvp, ino, mode) struct vnode *pvp; ino_t ino; int mode; @@ -1068,7 +1117,7 @@ static __inline int VOP_VFREE(pvp, ino, mode) a.a_mode = mode; return (VCALL(pvp, VOFFSET(vop_vfree), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_truncate_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -1078,9 +1127,10 @@ struct vop_truncate_args { struct proc *a_p; }; extern struct vnodeop_desc vop_truncate_desc; -static __inline int VOP_TRUNCATE __P((struct vnode *, off_t, int, +STATIC_INLINE int VOP_TRUNCATE __P((struct vnode *, off_t, int, struct ucred *, struct proc *)); -static __inline int VOP_TRUNCATE(vp, length, flags, cred, p) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_TRUNCATE(vp, length, flags, cred, p) struct vnode *vp; off_t length; int flags; @@ -1099,7 +1149,7 @@ static __inline int VOP_TRUNCATE(vp, length, flags, cred, p) a.a_p = p; return (VCALL(vp, VOFFSET(vop_truncate), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_update_args { struct vnodeop_desc *a_desc; struct vnode *a_vp; @@ -1108,9 +1158,10 @@ struct vop_update_args { int a_waitfor; }; extern struct vnodeop_desc vop_update_desc; -static __inline int VOP_UPDATE __P((struct vnode *, struct timespec *, +STATIC_INLINE int VOP_UPDATE __P((struct vnode *, struct timespec *, struct timespec *, int)); -static __inline int VOP_UPDATE(vp, access, modify, waitfor) +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_UPDATE(vp, access, modify, waitfor) struct vnode *vp; struct timespec *access; struct timespec *modify; @@ -1127,7 +1178,7 @@ static __inline int VOP_UPDATE(vp, access, modify, waitfor) a.a_waitfor = waitfor; return (VCALL(vp, VOFFSET(vop_update), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_whiteout_args { struct vnodeop_desc *a_desc; struct vnode *a_dvp; @@ -1135,9 +1186,10 @@ struct vop_whiteout_args { int a_flags; }; extern struct vnodeop_desc vop_whiteout_desc; -static __inline int VOP_WHITEOUT __P((struct vnode *, - struct componentname *, int)); -static __inline int VOP_WHITEOUT(dvp, cnp, flags) +STATIC_INLINE int VOP_WHITEOUT __P((struct vnode *, struct componentname *, + int)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_WHITEOUT(dvp, cnp, flags) struct vnode *dvp; struct componentname *cnp; int flags; @@ -1152,7 +1204,7 @@ static __inline int VOP_WHITEOUT(dvp, cnp, flags) a.a_flags = flags; return (VCALL(dvp, VOFFSET(vop_whiteout), &a)); } - +#endif /* !VOP_NOT_INLINE */ /* Special cases: */ #include <sys/buf.h> @@ -1161,8 +1213,9 @@ struct vop_strategy_args { struct buf *a_bp; }; extern struct vnodeop_desc vop_strategy_desc; -static __inline int VOP_STRATEGY __P((struct buf *)); -static __inline int VOP_STRATEGY(bp) +STATIC_INLINE int VOP_STRATEGY __P((struct buf *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_STRATEGY(bp) struct buf *bp; { struct vop_strategy_args a; @@ -1170,14 +1223,15 @@ static __inline int VOP_STRATEGY(bp) a.a_bp = bp; return (VCALL(bp->b_vp, VOFFSET(vop_strategy), &a)); } - +#endif /* !VOP_NOT_INLINE */ struct vop_bwrite_args { struct vnodeop_desc *a_desc; struct buf *a_bp; }; extern struct vnodeop_desc vop_bwrite_desc; -static __inline int VOP_BWRITE __P((struct buf *)); -static __inline int VOP_BWRITE(bp) +STATIC_INLINE int VOP_BWRITE __P((struct buf *)); +#if !defined(VOP_NOT_INLINE) || defined(INTERNAL_VOP_NOT_INLINE) +FUNC_STATIC_INLINE int VOP_BWRITE(bp) struct buf *bp; { struct vop_bwrite_args a; @@ -1185,5 +1239,5 @@ static __inline int VOP_BWRITE(bp) a.a_bp = bp; return (VCALL(bp->b_vp, VOFFSET(vop_bwrite), &a)); } - +#endif /* !VOP_NOT_INLINE */ /* End of special cases. */ |