Date: Sat, 23 Mar 2002 08:12:54 -0800 (PST) From: Poul-Henning Kamp <phk@FreeBSD.org> To: Perforce Change Reviews <perforce@freebsd.org> Subject: PERFORCE change 8266 for review Message-ID: <200203231612.g2NGCsR77706@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
http://people.freebsd.org/~peter/p4db/chv.cgi?CH=8266 Change 8266 by phk@phk_flat on 2002/03/23 08:12:49 Integrate style changes Affected files ... ... //depot/projects/sparc64/sys/sys/conf.h#11 integrate ... //depot/projects/sparc64/sys/sys/disklabel.h#12 integrate ... //depot/projects/sparc64/sys/sys/diskslice.h#4 integrate ... //depot/projects/sparc64/sys/sys/event.h#6 integrate ... //depot/projects/sparc64/sys/sys/file.h#10 integrate ... //depot/projects/sparc64/sys/sys/libkern.h#5 integrate ... //depot/projects/sparc64/sys/sys/malloc.h#5 integrate ... //depot/projects/sparc64/sys/sys/mount.h#8 integrate Differences ... ==== //depot/projects/sparc64/sys/sys/conf.h#11 (text+ko) ==== @@ -38,7 +38,7 @@ * SUCH DAMAGE. * * @(#)conf.h 8.5 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/conf.h,v 1.142 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/conf.h,v 1.143 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_CONF_H_ @@ -138,7 +138,7 @@ typedef int d_close_t(dev_t dev, int fflag, int devtype, struct thread *td); typedef void d_strategy_t(struct bio *bp); typedef int d_ioctl_t(dev_t dev, u_long cmd, caddr_t data, - int fflag, struct thread *td); + int fflag, struct thread *td); typedef int d_dump_t(dev_t dev); typedef int d_psize_t(dev_t dev); @@ -153,7 +153,7 @@ typedef int l_read_t(struct tty *tp, struct uio *uio, int flag); typedef int l_write_t(struct tty *tp, struct uio *uio, int flag); typedef int l_ioctl_t(struct tty *tp, u_long cmd, caddr_t data, - int flag, struct thread *td); + int flag, struct thread *td); typedef int l_rint_t(int c, struct tty *tp); typedef int l_start_t(struct tty *tp); typedef int l_modem_t(struct tty *tp, int flag); ==== //depot/projects/sparc64/sys/sys/disklabel.h#12 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)disklabel.h 8.2 (Berkeley) 7/10/94 - * $FreeBSD: src/sys/sys/disklabel.h,v 1.68 2002/03/19 13:54:13 phk Exp $ + * $FreeBSD: src/sys/sys/disklabel.h,v 1.70 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_DISKLABEL_H_ @@ -460,16 +460,15 @@ struct bio_queue_head; int bounds_check_with_label(struct bio *bp, struct disklabel *lp, - int wlabel); -void diskerr(struct bio *bp, char *what, int blkdone, - struct disklabel *lp); + int wlabel); +void diskerr(struct bio *bp, char *what, int blkdone, struct disklabel *lp); dev_t dkmodpart(dev_t dev, int part); dev_t dkmodslice(dev_t dev, int slice); u_int dkunit(dev_t dev); char *readdisklabel(dev_t dev, struct disklabel *lp); void bioqdisksort(struct bio_queue_head *ap, struct bio *bp); int setdisklabel(struct disklabel *olp, struct disklabel *nlp, - u_long openmask); + u_long openmask); int writedisklabel(dev_t dev, struct disklabel *lp); #ifdef __alpha__ struct buf; ==== //depot/projects/sparc64/sys/sys/diskslice.h#4 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/diskslice.h,v 1.42 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/diskslice.h,v 1.43 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_DISKSLICE_H_ @@ -81,16 +81,14 @@ int dscheck(struct bio *bp, struct diskslices *ssp); void dsclose(dev_t dev, int mode, struct diskslices *ssp); void dsgone(struct diskslices **sspp); -int dsinit(dev_t dev, struct disklabel *lp, - struct diskslices **sspp); -int dsioctl(dev_t dev, u_long cmd, caddr_t data, - int flags, struct diskslices **sspp); +int dsinit(dev_t dev, struct disklabel *lp, struct diskslices **sspp); +int dsioctl(dev_t dev, u_long cmd, caddr_t data, int flags, + struct diskslices **sspp); int dsisopen(struct diskslices *ssp); struct diskslices *dsmakeslicestruct(int nslices, struct disklabel *lp); -char *dsname(dev_t dev, int unit, int slice, int part, - char *partname); -int dsopen(dev_t dev, int mode, u_int flags, - struct diskslices **sspp, struct disklabel *lp); +char *dsname(dev_t dev, int unit, int slice, int part, char *partname); +int dsopen(dev_t dev, int mode, u_int flags, struct diskslices **sspp, + struct disklabel *lp); int dssize(dev_t dev, struct diskslices **sspp); #endif /* _KERNEL */ ==== //depot/projects/sparc64/sys/sys/event.h#6 (text+ko) ==== @@ -23,7 +23,7 @@ * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * - * $FreeBSD: src/sys/sys/event.h,v 1.18 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/event.h,v 1.19 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_EVENT_H_ @@ -136,9 +136,9 @@ struct filterops { int f_isfd; /* true if ident == filedescriptor */ - int (*f_attach) (struct knote *kn); - void (*f_detach) (struct knote *kn); - int (*f_event) (struct knote *kn, long hint); + int (*f_attach)(struct knote *kn); + void (*f_detach)(struct knote *kn); + int (*f_event)(struct knote *kn, long hint); }; struct knote { @@ -188,8 +188,8 @@ __BEGIN_DECLS int kqueue(void); int kevent(int kq, const struct kevent *changelist, int nchanges, - struct kevent *eventlist, int nevents, - const struct timespec *timeout); + struct kevent *eventlist, int nevents, + const struct timespec *timeout); __END_DECLS #endif /* !_KERNEL */ ==== //depot/projects/sparc64/sys/sys/file.h#10 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)file.h 8.3 (Berkeley) 1/9/95 - * $FreeBSD: src/sys/sys/file.h,v 1.42 2002/03/19 20:18:36 alfred Exp $ + * $FreeBSD: src/sys/sys/file.h,v 1.43 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_FILE_H_ @@ -79,22 +79,19 @@ int f_msgcount; /* (f) references from message queue */ struct ucred *f_cred; /* credentials associated with descriptor */ struct fileops { - int (*fo_read) (struct file *fp, struct uio *uio, - struct ucred *cred, int flags, - struct thread *td); - int (*fo_write) (struct file *fp, struct uio *uio, - struct ucred *cred, int flags, - struct thread *td); + int (*fo_read)(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); + int (*fo_write)(struct file *fp, struct uio *uio, + struct ucred *cred, int flags, struct thread *td); #define FOF_OFFSET 1 - int (*fo_ioctl) (struct file *fp, u_long com, - caddr_t data, struct thread *td); - int (*fo_poll) (struct file *fp, int events, - struct ucred *cred, - struct thread *td); - int (*fo_kqfilter) (struct file *fp, struct knote *kn); - int (*fo_stat) (struct file *fp, struct stat *sb, - struct thread *td); - int (*fo_close) (struct file *fp, struct thread *td); + int (*fo_ioctl)(struct file *fp, u_long com, caddr_t data, + struct thread *td); + int (*fo_poll)(struct file *fp, int events, + struct ucred *cred, struct thread *td); + int (*fo_kqfilter)(struct file *fp, struct knote *kn); + int (*fo_stat)(struct file *fp, struct stat *sb, + struct thread *td); + int (*fo_close)(struct file *fp, struct thread *td); } *f_ops; int f_seqcount; /* * count of sequential accesses -- cleared ==== //depot/projects/sparc64/sys/sys/libkern.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)libkern.h 8.1 (Berkeley) 6/10/93 - * $FreeBSD: src/sys/sys/libkern.h,v 1.29 2002/03/19 20:18:39 alfred Exp $ + * $FreeBSD: src/sys/sys/libkern.h,v 1.30 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_LIBKERN_H_ @@ -76,7 +76,7 @@ #endif int locc(int, char *, u_int); void qsort(void *base, size_t nmemb, size_t size, - int (*compar)(const void *, const void *)); + int (*compar)(const void *, const void *)); u_long random(void); char *index(const char *, int); char *rindex(const char *, int); ==== //depot/projects/sparc64/sys/sys/malloc.h#5 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)malloc.h 8.5 (Berkeley) 5/3/95 - * $FreeBSD: src/sys/sys/malloc.h,v 1.57 2002/03/19 20:18:40 alfred Exp $ + * $FreeBSD: src/sys/sys/malloc.h,v 1.58 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_MALLOC_H_ @@ -100,19 +100,18 @@ MALLOC_DECLARE(M_IOV); /* XXX struct malloc_type is unused for contig*(). */ -void contigfree(void *addr, unsigned long size, - struct malloc_type *type); -void *contigmalloc(unsigned long size, struct malloc_type *type, - int flags, unsigned long low, unsigned long high, - unsigned long alignment, unsigned long boundary); +void contigfree(void *addr, unsigned long size, struct malloc_type *type); +void *contigmalloc(unsigned long size, struct malloc_type *type, int flags, + unsigned long low, unsigned long high, unsigned long alignment, + unsigned long boundary); void free(void *addr, struct malloc_type *type); void *malloc(unsigned long size, struct malloc_type *type, int flags); void malloc_init(void *); void malloc_uninit(void *); -void *realloc(void *addr, unsigned long size, - struct malloc_type *type, int flags); -void *reallocf(void *addr, unsigned long size, - struct malloc_type *type, int flags); +void *realloc(void *addr, unsigned long size, struct malloc_type *type, + int flags); +void *reallocf(void *addr, unsigned long size, struct malloc_type *type, + int flags); #endif /* _KERNEL */ #endif /* !_SYS_MALLOC_H_ */ ==== //depot/projects/sparc64/sys/sys/mount.h#8 (text+ko) ==== @@ -31,7 +31,7 @@ * SUCH DAMAGE. * * @(#)mount.h 8.21 (Berkeley) 5/20/95 - * $FreeBSD: src/sys/sys/mount.h,v 1.120 2002/03/19 20:18:40 alfred Exp $ + * $FreeBSD: src/sys/sys/mount.h,v 1.121 2002/03/23 08:46:51 bde Exp $ */ #ifndef _SYS_MOUNT_H_ @@ -345,32 +345,30 @@ #endif struct vfsops { - int (*vfs_mount) (struct mount *mp, char *path, caddr_t data, - struct nameidata *ndp, struct thread *td); - int (*vfs_start) (struct mount *mp, int flags, - struct thread *td); - int (*vfs_unmount) (struct mount *mp, int mntflags, - struct thread *td); - int (*vfs_root) (struct mount *mp, struct vnode **vpp); - int (*vfs_quotactl) (struct mount *mp, int cmds, uid_t uid, - caddr_t arg, struct thread *td); - int (*vfs_statfs) (struct mount *mp, struct statfs *sbp, - struct thread *td); - int (*vfs_sync) (struct mount *mp, int waitfor, - struct ucred *cred, struct thread *td); - int (*vfs_vget) (struct mount *mp, ino_t ino, int flags, - struct vnode **vpp); - int (*vfs_fhtovp) (struct mount *mp, struct fid *fhp, - struct vnode **vpp); + int (*vfs_mount)(struct mount *mp, char *path, caddr_t data, + struct nameidata *ndp, struct thread *td); + int (*vfs_start)(struct mount *mp, int flags, struct thread *td); + int (*vfs_unmount)(struct mount *mp, int mntflags, + struct thread *td); + int (*vfs_root)(struct mount *mp, struct vnode **vpp); + int (*vfs_quotactl)(struct mount *mp, int cmds, uid_t uid, + caddr_t arg, struct thread *td); + int (*vfs_statfs)(struct mount *mp, struct statfs *sbp, + struct thread *td); + int (*vfs_sync)(struct mount *mp, int waitfor, struct ucred *cred, + struct thread *td); + int (*vfs_vget)(struct mount *mp, ino_t ino, int flags, + struct vnode **vpp); + int (*vfs_fhtovp)(struct mount *mp, struct fid *fhp, + struct vnode **vpp); int (*vfs_checkexp)(struct mount *mp, struct sockaddr *nam, - int *extflagsp, struct ucred **credanonp); - int (*vfs_vptofh) (struct vnode *vp, struct fid *fhp); - int (*vfs_init) (struct vfsconf *); - int (*vfs_uninit) (struct vfsconf *); + int *extflagsp, struct ucred **credanonp); + int (*vfs_vptofh)(struct vnode *vp, struct fid *fhp); + int (*vfs_init)(struct vfsconf *); + int (*vfs_uninit)(struct vfsconf *); int (*vfs_extattrctl)(struct mount *mp, int cmd, - struct vnode *filename_vp, - int attrnamespace, const char *attrname, - struct thread *td); + struct vnode *filename_vp, int attrnamespace, + const char *attrname, struct thread *td); }; #define VFS_MOUNT(MP, PATH, DATA, NDP, P) \ @@ -414,18 +412,18 @@ * exported vnode operations */ int dounmount(struct mount *, int, struct thread *td); -int vfs_mount (struct thread *td, const char *type, char *path, +int vfs_mount(struct thread *td, const char *type, char *path, int flags, void *data); int vfs_setpublicfs /* set publicly exported fs */ - (struct mount *, struct netexport *, struct export_args *); + (struct mount *, struct netexport *, struct export_args *); int vfs_lock(struct mount *); /* lock a vfs */ void vfs_msync(struct mount *, int); void vfs_unlock(struct mount *); /* unlock a vfs */ int vfs_busy(struct mount *, int, struct mtx *, struct thread *td); int vfs_export /* process mount export info */ - (struct mount *, struct export_args *); + (struct mount *, struct export_args *); struct netcred *vfs_export_lookup /* lookup host in fs export list */ - (struct mount *, struct sockaddr *); + (struct mount *, struct sockaddr *); int vfs_allocate_syncvnode(struct mount *); void vfs_getnewfsid(struct mount *); dev_t vfs_getrootfsid(struct mount *); To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe p4-projects" in the body of the message
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200203231612.g2NGCsR77706>