summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--include/stdio.h8
-rw-r--r--sys/sys/vnode.h104
2 files changed, 57 insertions, 55 deletions
diff --git a/include/stdio.h b/include/stdio.h
index db84d40..431eab0 100644
--- a/include/stdio.h
+++ b/include/stdio.h
@@ -334,10 +334,10 @@ __END_DECLS
*/
__BEGIN_DECLS
FILE *funopen __P((const void *,
- int (*)(void *, char *, int),
- int (*)(void *, const char *, int),
- fpos_t (*)(void *, fpos_t, int),
- int (*)(void *)));
+ int (*)(void *, char *, int),
+ int (*)(void *, const char *, int),
+ fpos_t (*)(void *, fpos_t, int),
+ int (*)(void *)));
__END_DECLS
#define fropen(cookie, fn) funopen(cookie, fn, 0, 0, 0)
#define fwopen(cookie, fn) funopen(cookie, 0, fn, 0, 0)
diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h
index 719d1d3..a5f4cfe 100644
--- a/sys/sys/vnode.h
+++ b/sys/sys/vnode.h
@@ -73,7 +73,7 @@ enum vtagtype {
*/
TAILQ_HEAD(buflists, buf);
-typedef int vop_t __P((void *));
+typedef int vop_t __P((void *));
struct namecache;
/*
@@ -118,7 +118,7 @@ struct vnode {
struct lock v_lock; /* used if fs don't have one */
struct lock *v_vnlock; /* pointer to vnode lock */
enum vtagtype v_tag; /* type of underlying data */
- void *v_data; /* private data for fs */
+ void *v_data; /* private data for fs */
LIST_HEAD(, namecache) v_cache_src; /* Cache entries from us */
TAILQ_HEAD(, namecache) v_cache_dst; /* Cache entries to us */
struct vnode *v_dd; /* .. vnode */
@@ -200,7 +200,7 @@ struct vattr {
* Flags for va_vaflags.
*/
#define VA_UTIMES_NULL 0x01 /* utimes argument was NULL */
-#define VA_EXCLUSIVE 0x02 /* exclusive create request */
+#define VA_EXCLUSIVE 0x02 /* exclusive create request */
/*
* Flags for ioflag. (high 16 bits used to ask for read-ahead and
@@ -213,7 +213,7 @@ struct vattr {
#define IO_NDELAY 0x10 /* FNDELAY flag set in file table */
#define IO_VMIO 0x20 /* data already in VMIO space */
#define IO_INVAL 0x40 /* invalidate after I/O */
-#define IO_ASYNC 0x80 /* bawrite rather then bdwrite */
+#define IO_ASYNC 0x80 /* bawrite rather then bdwrite */
/*
* Modes. Some values same as Ixxx entries from inode.h for now.
@@ -243,9 +243,9 @@ MALLOC_DECLARE(M_VNODE);
*/
extern enum vtype iftovt_tab[];
extern int vttoif_tab[];
-#define IFTOVT(mode) (iftovt_tab[((mode) & S_IFMT) >> 12])
-#define VTTOIF(indx) (vttoif_tab[(int)(indx)])
-#define MAKEIMODE(indx, mode) (int)(VTTOIF(indx) | (mode))
+#define IFTOVT(mode) (iftovt_tab[((mode) & S_IFMT) >> 12])
+#define VTTOIF(indx) (vttoif_tab[(int)(indx)])
+#define MAKEIMODE(indx, mode) (int)(VTTOIF(indx) | (mode))
/*
* Flags to various vnode functions.
@@ -298,13 +298,13 @@ extern int vfs_ioopt;
extern void (*lease_updatetime) __P((int deltat));
-#define VSHOULDFREE(vp) \
+#define VSHOULDFREE(vp) \
(!((vp)->v_flag & (VFREE|VDOOMED)) && \
!(vp)->v_holdcnt && !(vp)->v_usecount && \
(!(vp)->v_object || \
!((vp)->v_object->ref_count || (vp)->v_object->resident_page_count)))
-#define VSHOULDBUSY(vp) \
+#define VSHOULDBUSY(vp) \
(((vp)->v_flag & VFREE) && \
((vp)->v_holdcnt || (vp)->v_usecount))
@@ -322,14 +322,14 @@ extern void (*lease_updatetime) __P((int deltat));
/*
* Flags for vdesc_flags:
*/
-#define VDESC_MAX_VPS 16
+#define VDESC_MAX_VPS 16
/* Low order 16 flag bits are reserved for willrele flags for vp arguments. */
-#define VDESC_VP0_WILLRELE 0x0001
-#define VDESC_VP1_WILLRELE 0x0002
-#define VDESC_VP2_WILLRELE 0x0004
-#define VDESC_VP3_WILLRELE 0x0008
-#define VDESC_NOMAP_VPP 0x0100
-#define VDESC_VPP_WILLRELE 0x0200
+#define VDESC_VP0_WILLRELE 0x0001
+#define VDESC_VP1_WILLRELE 0x0002
+#define VDESC_VP2_WILLRELE 0x0004
+#define VDESC_VP3_WILLRELE 0x0008
+#define VDESC_NOMAP_VPP 0x0100
+#define VDESC_VPP_WILLRELE 0x0200
/*
* VDESC_NO_OFFSET is used to identify the end of the offset list
@@ -341,9 +341,9 @@ extern void (*lease_updatetime) __P((int deltat));
* This structure describes the vnode operation taking place.
*/
struct vnodeop_desc {
- int vdesc_offset; /* offset in vector--first for speed */
- char *vdesc_name; /* a readable name for debugging */
- int vdesc_flags; /* VDESC_* flags */
+ int vdesc_offset; /* offset in vector,first for speed */
+ char *vdesc_name; /* a readable name for debugging */
+ int vdesc_flags; /* VDESC_* flags */
/*
* These ops are used by bypass routines to map and locate arguments.
@@ -382,11 +382,11 @@ extern struct mtx mntvnode_mtx;
* Crays, so if you decide to port this to such a serious machine,
* you might want to consult Intrinsic.h's XtOffset{,Of,To}.
*/
-#define VOPARG_OFFSET(p_type,field) \
- ((int) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
-#define VOPARG_OFFSETOF(s_type,field) \
+#define VOPARG_OFFSET(p_type,field) \
+ ((int) (((char *) (&(((p_type)NULL)->field))) - ((char *) NULL)))
+#define VOPARG_OFFSETOF(s_type,field) \
VOPARG_OFFSET(s_type*,field)
-#define VOPARG_OFFSETTO(S_TYPE,S_OFFSET,STRUCT_P) \
+#define VOPARG_OFFSETTO(S_TYPE,S_OFFSET,STRUCT_P) \
((S_TYPE)(((char*)(STRUCT_P))+(S_OFFSET)))
@@ -426,12 +426,12 @@ struct vop_generic_args {
/*
* [dfr] Kludge until I get around to fixing all the vfs locking.
*/
-#define IS_LOCKING_VFS(vp) ((vp)->v_tag == VT_UFS \
- || (vp)->v_tag == VT_MFS \
- || (vp)->v_tag == VT_NFS \
- || (vp)->v_tag == VT_LFS \
- || (vp)->v_tag == VT_ISOFS \
- || (vp)->v_tag == VT_MSDOSFS \
+#define IS_LOCKING_VFS(vp) ((vp)->v_tag == VT_UFS \
+ || (vp)->v_tag == VT_MFS \
+ || (vp)->v_tag == VT_NFS \
+ || (vp)->v_tag == VT_LFS \
+ || (vp)->v_tag == VT_ISOFS \
+ || (vp)->v_tag == VT_MSDOSFS \
|| (vp)->v_tag == VT_DEVFS)
#define ASSERT_VOP_LOCKED(vp, str) \
@@ -511,13 +511,13 @@ do { \
*/
extern int vmiodirenable;
-
+
static __inline int
-vn_canvmio(struct vnode *vp)
+vn_canvmio(struct vnode *vp)
{
- if (vp && (vp->v_type == VREG || (vmiodirenable && vp->v_type == VDIR)))
- return(TRUE);
- return(FALSE);
+ if (vp && (vp->v_type == VREG || (vmiodirenable && vp->v_type == VDIR)))
+ return(TRUE);
+ return(FALSE);
}
/*
@@ -544,7 +544,7 @@ struct vnode;
extern int (*lease_check_hook) __P((struct vop_lease_args *));
struct vnode *addaliasu __P((struct vnode *vp, udev_t nvp_rdev));
-int bdevvp __P((dev_t dev, struct vnode **vpp));
+int bdevvp __P((dev_t dev, struct vnode **vpp));
/* cache_* may belong in namei.h. */
void cache_enter __P((struct vnode *dvp, struct vnode *vp,
struct componentname *cnp));
@@ -555,37 +555,39 @@ void cache_purgevfs __P((struct mount *mp));
void cache_purgeleafdirs __P((int ndir));
void cvtstat __P((struct stat *st, struct ostat *ost));
void cvtnstat __P((struct stat *sb, struct nstat *nsb));
-int getnewvnode __P((enum vtagtype tag,
+int getnewvnode __P((enum vtagtype tag,
struct mount *mp, vop_t **vops, struct vnode **vpp));
int lease_check __P((struct vop_lease_args *ap));
int spec_vnoperate __P((struct vop_generic_args *));
int speedup_syncer __P((void));
-int textvp_fullpath __P((struct proc *p, char **retbuf, char **retfreebuf));
+int textvp_fullpath __P((struct proc *p, char **retbuf,
+ char **retfreebuf));
int vaccess __P((enum vtype type, mode_t file_mode, uid_t uid, gid_t gid,
mode_t acc_mode, struct ucred *cred, int *privused));
+int vaccess_acl_posix1e __P((enum vtype type, struct acl *acl,
+ mode_t acc_mode, struct ucred *cred, int *privused));
int vaccess_acl_posix1e __P((enum vtype type, uid_t file_uid,
gid_t file_gid, struct acl *acl, mode_t acc_mode,
struct ucred *cred, int *privused));
-void vattr_null __P((struct vattr *vap));
-int vcount __P((struct vnode *vp));
+void vattr_null __P((struct vattr *vap));
+int vcount __P((struct vnode *vp));
void vdrop __P((struct vnode *));
int vfinddev __P((dev_t dev, enum vtype type, struct vnode **vpp));
void vfs_add_vnodeops __P((const void *));
void vfs_rm_vnodeops __P((const void *));
int vflush __P((struct mount *mp, struct vnode *skipvp, int flags));
-int vget __P((struct vnode *vp, int lockflag, struct proc *p));
-void vgone __P((struct vnode *vp));
+int vget __P((struct vnode *vp, int lockflag, struct proc *p));
+void vgone __P((struct vnode *vp));
void vgonel __P((struct vnode *vp, struct proc *p));
void vhold __P((struct vnode *));
int vinvalbuf __P((struct vnode *vp, int save, struct ucred *cred,
-
struct proc *p, int slpflag, int slptimeo));
int vtruncbuf __P((struct vnode *vp, struct ucred *cred, struct proc *p,
- off_t length, int blksize));
+ off_t length, int blksize));
void vprint __P((char *label, struct vnode *vp));
int vrecycle __P((struct vnode *vp, struct mtx *inter_lkp,
struct proc *p));
-int vn_close __P((struct vnode *vp,
+int vn_close __P((struct vnode *vp,
int flags, struct ucred *cred, struct proc *p));
void vn_finished_write __P((struct mount *mp));
int vn_isdisk __P((struct vnode *vp, int *errp));
@@ -595,19 +597,19 @@ int debug_vn_lock __P((struct vnode *vp, int flags, struct proc *p,
const char *filename, int line));
#define vn_lock(vp,flags,p) debug_vn_lock(vp,flags,p,__FILE__,__LINE__)
#endif
-int vn_open __P((struct nameidata *ndp, int *flagp, int cmode));
+int vn_open __P((struct nameidata *ndp, int *flagp, int cmode));
void vn_pollevent __P((struct vnode *vp, int events));
void vn_pollgone __P((struct vnode *vp));
int vn_pollrecord __P((struct vnode *vp, struct proc *p, int events));
-int vn_rdwr __P((enum uio_rw rw, struct vnode *vp, caddr_t base,
+int vn_rdwr __P((enum uio_rw rw, struct vnode *vp, caddr_t base,
int len, off_t offset, enum uio_seg segflg, int ioflg,
struct ucred *cred, int *aresid, struct proc *p));
int vn_stat __P((struct vnode *vp, struct stat *sb, struct proc *p));
int vn_start_write __P((struct vnode *vp, struct mount **mpp, int flags));
dev_t vn_todev __P((struct vnode *vp));
int vn_write_suspend_wait __P((struct vnode *vp, struct mount *mp,
- int flags));
-int vn_writechk __P((struct vnode *vp));
+ int flags));
+int vn_writechk __P((struct vnode *vp));
int vn_extattr_get __P((struct vnode *vp, int ioflg, int attrnamespace,
const char *attrname, int *buflen, char *buf, struct proc *p));
int vn_extattr_set __P((struct vnode *vp, int ioflg, int attrnamespace,
@@ -616,7 +618,7 @@ int vn_extattr_rm(struct vnode *vp, int ioflg, int attrnamespace,
const char *attrname, struct proc *p);
int vfs_cache_lookup __P((struct vop_lookup_args *ap));
int vfs_object_create __P((struct vnode *vp, struct proc *p,
- struct ucred *cred));
+ struct ucred *cred));
void vfs_timestamp __P((struct timespec *));
void vfs_write_resume __P((struct mount *mp));
void vfs_write_suspend __P((struct mount *mp));
@@ -645,8 +647,8 @@ int vop_stddestroyvobject __P((struct vop_destroyvobject_args *ap));
int vop_stdgetvobject __P((struct vop_getvobject_args *ap));
void vfree __P((struct vnode *));
-void vput __P((struct vnode *vp));
-void vrele __P((struct vnode *vp));
+void vput __P((struct vnode *vp));
+void vrele __P((struct vnode *vp));
void vref __P((struct vnode *vp));
void vbusy __P((struct vnode *vp));
OpenPOWER on IntegriCloud