Deleted Added
full compact
ext2_subr.c (147393) ext2_subr.c (202283)
1/*-
2 * modified for Lites 1.1
3 *
4 * Aug 1995, Godmar Back (gback@cs.utah.edu)
5 * University of Utah, Department of Computer Science
6 */
7/*-
8 * Copyright (c) 1982, 1986, 1989, 1993

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

28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93
1/*-
2 * modified for Lites 1.1
3 *
4 * Aug 1995, Godmar Back (gback@cs.utah.edu)
5 * University of Utah, Department of Computer Science
6 */
7/*-
8 * Copyright (c) 1982, 1986, 1989, 1993

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

28 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
29 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
30 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
31 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
32 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
33 * SUCH DAMAGE.
34 *
35 * @(#)ffs_subr.c 8.2 (Berkeley) 9/21/93
36 * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_subr.c 147393 2005-06-15 02:36:11Z rodrigc $
36 * $FreeBSD: head/sys/fs/ext2fs/ext2_subr.c 202283 2010-01-14 14:30:54Z lulf $
37 */
38
39#include <sys/param.h>
40
41#include <sys/proc.h>
42#include <sys/systm.h>
43#include <sys/bio.h>
44#include <sys/buf.h>
45#include <sys/lock.h>
46#include <sys/ucred.h>
47#include <sys/vnode.h>
48
37 */
38
39#include <sys/param.h>
40
41#include <sys/proc.h>
42#include <sys/systm.h>
43#include <sys/bio.h>
44#include <sys/buf.h>
45#include <sys/lock.h>
46#include <sys/ucred.h>
47#include <sys/vnode.h>
48
49#include <gnu/fs/ext2fs/inode.h>
50#include <gnu/fs/ext2fs/ext2_extern.h>
51#include <gnu/fs/ext2fs/ext2_fs_sb.h>
52#include <gnu/fs/ext2fs/fs.h>
49#include
50#include
51#include <fs/ext2fs/ext2fs.h>
52#include
53
54#ifdef KDB
55void ext2_checkoverlap(struct buf *, struct inode *);
56#endif
57
58/*
59 * Return buffer with the contents of block "offset" from the beginning of
60 * directory "ip". If "res" is non-zero, fill it in with a pointer to the
61 * remaining space in the directory.
62 */
63int
64ext2_blkatoff(vp, offset, res, bpp)
65 struct vnode *vp;
66 off_t offset;
67 char **res;
68 struct buf **bpp;
69{
70 struct inode *ip;
53
54#ifdef KDB
55void ext2_checkoverlap(struct buf *, struct inode *);
56#endif
57
58/*
59 * Return buffer with the contents of block "offset" from the beginning of
60 * directory "ip". If "res" is non-zero, fill it in with a pointer to the
61 * remaining space in the directory.
62 */
63int
64ext2_blkatoff(vp, offset, res, bpp)
65 struct vnode *vp;
66 off_t offset;
67 char **res;
68 struct buf **bpp;
69{
70 struct inode *ip;
71 struct ext2_sb_info *fs;
71 struct m_ext2fs *fs;
72 struct buf *bp;
73 int32_t lbn;
74 int bsize, error;
75
76 ip = VTOI(vp);
77 fs = ip->i_e2fs;
78 lbn = lblkno(fs, offset);
79 bsize = blksize(fs, ip, lbn);

--- 41 unchanged lines hidden ---
72 struct buf *bp;
73 int32_t lbn;
74 int bsize, error;
75
76 ip = VTOI(vp);
77 fs = ip->i_e2fs;
78 lbn = lblkno(fs, offset);
79 bsize = blksize(fs, ip, lbn);

--- 41 unchanged lines hidden ---