diff --git a/sys/ufs/lfs/lfs_cksum.c b/sys/ufs/lfs/lfs_cksum.c index 7fdb8d1d1ea6..997094986cae 100644 --- a/sys/ufs/lfs/lfs_cksum.c +++ b/sys/ufs/lfs/lfs_cksum.c @@ -1,64 +1,69 @@ /*- * Copyright (c) 1991, 1993 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * @(#)lfs_cksum.c 8.1 (Berkeley) 6/11/93 - * $Id: lfs_cksum.c,v 1.3 1995/05/30 08:15:14 rgrimes Exp $ + * $Id: lfs_cksum.c,v 1.4 1995/12/03 11:16:39 bde Exp $ */ +#ifdef KERNEL #include #include #include #include +#else +#include +#endif + #include /* * Simple, general purpose, fast checksum. Data must be short-aligned. * Returns a u_long in case we ever want to do something more rigorous. * * XXX * Use the TCP/IP checksum instead. */ u_long cksum(str, len) register void *str; register size_t len; { register u_long sum; len &= ~(sizeof(u_short) - 1); for (sum = 0; len; len -= sizeof(u_short)) { sum ^= *(u_short *)str; ++(u_short *)str; } return (sum); } diff --git a/sys/ufs/lfs/lfs_extern.h b/sys/ufs/lfs/lfs_extern.h index bacb2e9ddcef..4390bcb8fe9e 100644 --- a/sys/ufs/lfs/lfs_extern.h +++ b/sys/ufs/lfs/lfs_extern.h @@ -1,117 +1,120 @@ /*- * Copyright (c) 1991, 1993, 1994 * The Regents of the University of California. All rights reserved. * * Redistribution and use in source and binary forms, with or without * modification, are permitted provided that the following conditions * are met: * 1. Redistributions of source code must retain the above copyright * notice, this list of conditions and the following disclaimer. * 2. Redistributions in binary form must reproduce the above copyright * notice, this list of conditions and the following disclaimer in the * documentation and/or other materials provided with the distribution. * 3. All advertising materials mentioning features or use of this software * must display the following acknowledgement: * This product includes software developed by the University of * California, Berkeley and its contributors. * 4. Neither the name of the University nor the names of its contributors * may be used to endorse or promote products derived from this software * without specific prior written permission. * * THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE * ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF * SUCH DAMAGE. * * @(#)lfs_extern.h 8.2 (Berkeley) 4/16/94 - * $Id: lfs_extern.h,v 1.7 1995/08/16 16:14:10 bde Exp $ + * $Id: lfs_extern.h,v 1.8 1995/11/09 08:14:13 bde Exp $ */ #ifndef _UFS_LFS_LFS_EXTERN_H_ -#define _UFS_LFS_LFS_EXTERN_H_ +#define _UFS_LFS_LFS_EXTERN_H_ +#ifdef KERNEL struct fid; struct mount; struct nameidata; struct proc; struct statfs; struct timeval; struct inode; struct uio; struct mbuf; -__BEGIN_DECLS -u_long cksum __P((void *, size_t)); /* XXX */ int lfs_balloc __P((struct vnode *, u_long, daddr_t, struct buf **)); int lfs_blkatoff __P((struct vop_blkatoff_args *)); int lfs_bwrite __P((struct vop_bwrite_args *)); int lfs_check __P((struct vnode *, daddr_t)); int lfs_close __P((struct vop_close_args *)); int lfs_create __P((struct vop_create_args *)); int lfs_fhtovp __P((struct mount *, struct fid *, struct mbuf *, struct vnode **, int *, struct ucred **)); void lfs_free_buffer __P((caddr_t, int)); int lfs_fsync __P((struct vop_fsync_args *)); int lfs_gatherblock __P((struct segment *, struct buf *, int *)); int lfs_getattr __P((struct vop_getattr_args *)); struct dinode * lfs_ifind __P((struct lfs *, ino_t, struct dinode *)); int lfs_inactive __P((struct vop_inactive_args *)); int lfs_init __P((void)); int lfs_initseg __P((struct lfs *)); int lfs_link __P((struct vop_link_args *)); int lfs_makeinode __P((int, struct nameidata *, struct inode **)); int lfs_mkdir __P((struct vop_mkdir_args *)); int lfs_mknod __P((struct vop_mknod_args *)); int lfs_mount __P((struct mount *, char *, caddr_t, struct nameidata *, struct proc *)); int lfs_mountroot __P((void)); struct buf * lfs_newbuf __P((struct vnode *, daddr_t, size_t)); int lfs_read __P((struct vop_read_args *)); int lfs_remove __P((struct vop_remove_args *)); int lfs_rmdir __P((struct vop_rmdir_args *)); int lfs_rename __P((struct vop_rename_args *)); void lfs_seglock __P((struct lfs *, unsigned long flags)); void lfs_segunlock __P((struct lfs *)); int lfs_segwrite __P((struct mount *, int)); int lfs_statfs __P((struct mount *, struct statfs *, struct proc *)); int lfs_symlink __P((struct vop_symlink_args *)); int lfs_sync __P((struct mount *, int, struct ucred *, struct proc *)); int lfs_truncate __P((struct vop_truncate_args *)); int lfs_unmount __P((struct mount *, int, struct proc *)); int lfs_update __P((struct vop_update_args *)); void lfs_updatemeta __P((struct segment *)); int lfs_valloc __P((struct vop_valloc_args *)); int lfs_vcreate __P((struct mount *, ino_t, struct vnode **)); int lfs_vfree __P((struct vop_vfree_args *)); int lfs_vflush __P((struct vnode *)); int lfs_vget __P((struct mount *, ino_t, struct vnode **)); int lfs_vptofh __P((struct vnode *, struct fid *)); int lfs_vref __P((struct vnode *)); void lfs_vunref __P((struct vnode *)); int lfs_write __P((struct vop_write_args *)); int lfs_writeinode __P((struct lfs *, struct segment *, struct inode *)); int lfs_writeseg __P((struct lfs *, struct segment *)); void lfs_writesuper __P((struct lfs *)); #ifdef DEBUG void lfs_dump_dinode __P((struct dinode *)); void lfs_dump_super __P((struct lfs *)); #endif -__END_DECLS extern int lfs_allclean_wakeup; extern int locked_queue_count; extern vop_t **lfs_vnodeop_p; extern vop_t **lfs_specop_p; extern vop_t **lfs_fifoop_p; #define LFS_FIFOOPS lfs_fifoop_p +#endif /* KERNEL */ -#endif +__BEGIN_DECLS +u_long cksum __P((void *, size_t)); /* XXX */ +__END_DECLS + +#endif /* !_UFS_LFS_LFS_EXTERN_H_ */