Deleted Added
sdiff udiff text old ( 31274 ) new ( 31352 )
full compact
ffs_subr.c (31274) ffs_subr.c (31352)
1/*
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95
1/*
2 * Copyright (c) 1982, 1986, 1989, 1993
3 * The Regents of the University of California. All rights reserved.
4 *
5 * Redistribution and use in source and binary forms, with or without
6 * modification, are permitted provided that the following conditions
7 * are met:
8 * 1. Redistributions of source code must retain the above copyright

--- 17 unchanged lines hidden (view full) ---

26 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
27 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
28 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
29 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
30 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31 * SUCH DAMAGE.
32 *
33 * @(#)ffs_subr.c 8.5 (Berkeley) 3/21/95
34 * $Id: ffs_subr.c,v 1.13 1997/10/16 10:49:30 phk Exp $
34 * $Id: ffs_subr.c,v 1.14 1997/11/18 15:10:38 bde Exp $
35 */
36
37#include <sys/param.h>
38#include <ufs/ffs/fs.h>
39
40#ifndef KERNEL
41#include <ufs/ufs/dinode.h>
42#else
43#include "opt_ddb.h"
44
45#include <sys/systm.h>
46#include <sys/vnode.h>
47#include <sys/buf.h>
48#include <ufs/ufs/quota.h>
49#include <ufs/ufs/inode.h>
50#include <ufs/ffs/ffs_extern.h>
51
35 */
36
37#include <sys/param.h>
38#include <ufs/ffs/fs.h>
39
40#ifndef KERNEL
41#include <ufs/ufs/dinode.h>
42#else
43#include "opt_ddb.h"
44
45#include <sys/systm.h>
46#include <sys/vnode.h>
47#include <sys/buf.h>
48#include <ufs/ufs/quota.h>
49#include <ufs/ufs/inode.h>
50#include <ufs/ffs/ffs_extern.h>
51
52#if defined(KERNEL) && defined(DIAGNOSTIC) && defined(DDB)
53static void ffs_checkoverlap __P((struct buf *, struct inode *));
54#endif
55
52/*
53 * Return buffer with the contents of block "offset" from the beginning of
54 * directory "ip". If "res" is non-zero, fill it in with a pointer to the
55 * remaining space in the directory.
56 */
57int
58ffs_blkatoff(vp, offset, res, bpp)
59 struct vnode *vp;

--- 56 unchanged lines hidden (view full) ---

116 }
117 field <<= 1;
118 subfield <<= 1;
119 }
120 }
121}
122
123#if defined(KERNEL) && defined(DIAGNOSTIC) && defined(DDB)
56/*
57 * Return buffer with the contents of block "offset" from the beginning of
58 * directory "ip". If "res" is non-zero, fill it in with a pointer to the
59 * remaining space in the directory.
60 */
61int
62ffs_blkatoff(vp, offset, res, bpp)
63 struct vnode *vp;

--- 56 unchanged lines hidden (view full) ---

120 }
121 field <<= 1;
122 subfield <<= 1;
123 }
124 }
125}
126
127#if defined(KERNEL) && defined(DIAGNOSTIC) && defined(DDB)
124void
128static void
125ffs_checkoverlap(bp, ip)
126 struct buf *bp;
127 struct inode *ip;
128{
129 register struct buf *ebp, *ep;
130 register ufs_daddr_t start, last;
131 struct vnode *vp;
132

--- 111 unchanged lines hidden --- 		129ffs_checkoverlap(bp, ip)
130 struct buf *bp;
131 struct inode *ip;
132{
133 register struct buf *ebp, *ep;
134 register ufs_daddr_t start, last;
135 struct vnode *vp;
136

--- 111 unchanged lines hidden ---