diff options
author | Ted Unangst <tedu@cvs.openbsd.org> | 2003-08-05 21:27:16 +0000 |
---|---|---|
committer | Ted Unangst <tedu@cvs.openbsd.org> | 2003-08-05 21:27:16 +0000 |
commit | 870a53cb501bd8f6b285e33080a5ed21d80f48aa (patch) | |
tree | 036da8a8dd0b75188a6eeb468a169f45001e5b0d | |
parent | 84a551df643db1c94c1ae167c42a8e143786d703 (diff) |
whitespace pretties. sorry, couldn't take it anymore
-rw-r--r-- | sys/sys/mount.h | 38 | ||||
-rw-r--r-- | sys/sys/vnode.h | 34 |
2 files changed, 38 insertions, 34 deletions
diff --git a/sys/sys/mount.h b/sys/sys/mount.h index 413dfc9b699..38dbc9dda00 100644 --- a/sys/sys/mount.h +++ b/sys/sys/mount.h @@ -1,4 +1,4 @@ -/* $OpenBSD: mount.h,v 1.56 2003/08/05 20:47:36 tedu Exp $ */ +/* $OpenBSD: mount.h,v 1.57 2003/08/05 21:27:15 tedu Exp $ */ /* $NetBSD: mount.h,v 1.48 1996/02/18 11:55:47 fvdl Exp $ */ /* @@ -52,7 +52,7 @@ typedef struct { int32_t val[2]; } fsid_t; /* file system id type */ struct fid { u_short fid_len; /* length of data in bytes */ u_short fid_reserved; /* force longword alignment */ - char fid_data[MAXFIDSZ]; /* data (variable length) */ + char fid_data[MAXFIDSZ]; /* data (variable length) */ }; /* @@ -178,7 +178,7 @@ struct nfs_args3 { /* Flags valid only in mount syscall arguments */ #define NFSMNT_ACREGMIN 0x00040000 /* acregmin field valid */ -#define NFSMNT_ACREGMAX 0x00080000 /* acregmax field valid */ +#define NFSMNT_ACREGMAX 0x00080000 /* acregmax field valid */ #define NFSMNT_ACDIRMIN 0x00100000 /* acdirmin field valid */ #define NFSMNT_ACDIRMAX 0x00200000 /* acdirmax field valid */ @@ -236,29 +236,33 @@ struct adosfs_args { /* * Arguments to mount ntfs filesystems */ - struct ntfs_args { - char *fspec; /* block special device to mount */ - struct export_args export_info;/* network export information */ - uid_t uid; /* uid that owns ntfs files */ - gid_t gid; /* gid that owns ntfs files */ - mode_t mode; /* mask to be applied for ntfs perms */ - u_long flag; /* additional flags */ + char *fspec; /* block special device to mount */ + struct export_args export_info;/* network export information */ + uid_t uid; /* uid that owns ntfs files */ + gid_t gid; /* gid that owns ntfs files */ + mode_t mode; /* mask to be applied for ntfs perms */ + u_long flag; /* additional flags */ }; /* * ntfs mount options: */ -#define NTFS_MFLAG_CASEINS 0x00000001 -#define NTFS_MFLAG_ALLNAMES 0x00000002 +#define NTFS_MFLAG_CASEINS 0x00000001 +#define NTFS_MFLAG_ALLNAMES 0x00000002 +/* + * Arguments to mount procfs filesystems + */ struct procfs_args { int version; int flags; }; +/* + * procfs mount options: + */ #define PROCFS_ARGSVERSION 1 - #define PROCFSMNT_LINUXCOMPAT 0x01 @@ -517,11 +521,11 @@ struct vfsops { #define VFS_EXTATTRCTL(MP, C, FN, NS, N, P) \ (*(MP)->mnt_op->vfs_extattrctl)(MP, C, FN, NS, N, P) -/* - * Declarations for these vfs default operations are located in - * kern/vfs_default.c, they should be used instead of making "dummy" +/* + * Declarations for these vfs default operations are located in + * kern/vfs_default.c, they should be used instead of making "dummy" * functions or casting entries in the VFS op table to "enopnotsupp()". - */ + */ int vfs_stdextattrctl(struct mount *mp, int cmd, struct vnode *filename_vp, int attrnamespace, const char *attrname, struct proc *p); diff --git a/sys/sys/vnode.h b/sys/sys/vnode.h index d6fb8e74104..41cba99f777 100644 --- a/sys/sys/vnode.h +++ b/sys/sys/vnode.h @@ -1,4 +1,4 @@ -/* $OpenBSD: vnode.h,v 1.55 2003/06/02 23:28:22 millert Exp $ */ +/* $OpenBSD: vnode.h,v 1.56 2003/08/05 21:27:15 tedu Exp $ */ /* $NetBSD: vnode.h,v 1.38 1996/02/29 20:59:05 cgd Exp $ */ /* @@ -89,7 +89,7 @@ struct vnode { u_int v_flag; /* vnode flags (see below) */ u_int v_usecount; /* reference count of users */ /* reference count of writers */ - u_int v_writecount; + u_int v_writecount; /* Flags that can be read/written in interrupts */ u_int v_bioflag; u_int v_holdcnt; /* buffer references */ @@ -109,10 +109,10 @@ struct vnode { } v_un; struct simplelock v_interlock; /* lock on usecount and flag */ - struct lock v_lock; + struct lock v_lock; struct lock *v_vnlock; /* used for non-locking fs's */ enum vtagtype v_tag; /* type of underlying data */ - void *v_data; /* private data for fs */ + void *v_data; /* private data for fs */ struct { struct simplelock vsi_lock; /* lock to protect below */ struct selinfo vsi_selinfo; /* identity of poller(s) */ @@ -204,7 +204,7 @@ struct vattr { struct e_vnode { struct vnode *vptr; struct vnode vnode; -}; +}; #ifdef _KERNEL /* @@ -419,14 +419,14 @@ struct uio; struct vattr; struct vnode; -int bdevvp(dev_t dev, struct vnode **vpp); -int cdevvp(dev_t dev, struct vnode **vpp); -int getnewvnode(enum vtagtype tag, struct mount *mp, +int bdevvp(dev_t dev, struct vnode **vpp); +int cdevvp(dev_t dev, struct vnode **vpp); +int getnewvnode(enum vtagtype tag, struct mount *mp, int (**vops)(void *), struct vnode **vpp); int getvnode(struct filedesc *fdp, int fd, struct file **fpp); void getnewfsid(struct mount *, int); -void vattr_null(struct vattr *vap); -int vcount(struct vnode *vp); +void vattr_null(struct vattr *vap); +int vcount(struct vnode *vp); int vfinddev(dev_t, enum vtype, struct vnode **); void vflushbuf(struct vnode *vp, int sync); int vflush(struct mount *mp, struct vnode *vp, int flags); @@ -435,20 +435,20 @@ void vn_initialize_syncerd(void); int vwaitforio(struct vnode *, int, char *, int); void vwakeup(struct vnode *); void vdevgone(int, int, int, enum vtype); -int vget(struct vnode *vp, int lockflag, struct proc *p); -void vgone(struct vnode *vp); +int vget(struct vnode *vp, int lockflag, struct proc *p); +void vgone(struct vnode *vp); void vgonel(struct vnode *, struct proc *); int vinvalbuf(struct vnode *vp, int save, struct ucred *cred, struct proc *p, int slpflag, int slptimeo); void vprint(char *label, struct vnode *vp); int vop_generic_bwrite(void *ap); void vn_update(void); -int vn_close(struct vnode *vp, +int vn_close(struct vnode *vp, int flags, struct ucred *cred, struct proc *p); -int vn_open(struct nameidata *ndp, int fmode, int cmode); +int vn_open(struct nameidata *ndp, int fmode, int cmode); int vrecycle(struct vnode *vp, struct simplelock *inter_lkp, struct proc *p); -int vn_rdwr(enum uio_rw rw, struct vnode *vp, caddr_t base, +int vn_rdwr(enum uio_rw rw, struct vnode *vp, caddr_t base, int len, off_t offset, enum uio_seg segflg, int ioflg, struct ucred *cred, size_t *aresid, struct proc *p); int vn_lock(struct vnode *vp, int flags, struct proc *p); @@ -469,8 +469,8 @@ void sched_sync(struct proc *); struct vnode * checkalias(struct vnode *vp, dev_t nvp_rdev, struct mount *mp); -void vput(struct vnode *vp); -void vrele(struct vnode *vp); +void vput(struct vnode *vp); +void vrele(struct vnode *vp); int vaccess(mode_t file_mode, uid_t uid, gid_t gid, mode_t acc_mode, struct ucred *cred); |