39c39
< * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_bmap.c 96572 2002-05-14 11:09:43Z phk $
---
> * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_bmap.c 96596 2002-05-14 17:14:01Z iedowse $
52,56c52,54
< #include <ufs/ufs/extattr.h>
< #include <ufs/ufs/quota.h>
< #include <ufs/ufs/inode.h>
< #include <ufs/ufs/ufsmount.h>
< #include <ufs/ufs/ufs_extern.h>
---
> #include <gnu/ext2fs/inode.h>
> #include <gnu/ext2fs/ext2_mount.h>
> #include <gnu/ext2fs/ext2_extern.h>
64c62
< ufs_bmap(ap)
---
> ext2_bmap(ap)
86c84
< error = ufs_bmaparray(ap->a_vp, ap->a_bn, &blkno,
---
> error = ext2_bmaparray(ap->a_vp, ap->a_bn, &blkno,
107c105
< ufs_bmaparray(vp, bn, bnp, runp, runb)
---
> ext2_bmaparray(vp, bn, bnp, runp, runb)
109,110c107,108
< ufs_daddr_t bn;
< ufs_daddr_t *bnp;
---
> daddr_t bn;
> daddr_t *bnp;
116c114
< struct ufsmount *ump;
---
> struct ext2mount *ump;
120c118
< ufs_daddr_t daddr;
---
> daddr_t daddr;
128c126
< ump = VFSTOUFS(mp);
---
> ump = VFSTOEXT2(mp);
143c141
< error = ufs_getlbns(vp, bn, ap, nump);
---
> error = ext2_getlbns(vp, bn, ap, nump);
150,159c148
< /*
< * Since this is FFS independent code, we are out of
< * scope for the definitions of BLK_NOCOPY and
< * BLK_SNAP, but we do know that they will fall in
< * the range 1..um_seqinc, so we use that test and
< * return a request for a zeroed out buffer if attempts
< * are made to read a BLK_NOCOPY or BLK_SNAP block.
< */
< if ((ip->i_flags & SF_SNAPSHOT) &&
< ip->i_db[bn] > 0 && ip->i_db[bn] < ump->um_seqinc) {
---
> if (*bnp == 0) {
161,165d149
< } else if (*bnp == 0) {
< if (ip->i_flags & SF_SNAPSHOT)
< *bnp = blkptrtodb(ump, bn * ump->um_seqinc);
< else
< *bnp = -1;
224c208
< daddr = ((ufs_daddr_t *)bp->b_data)[ap->in_off];
---
> daddr = ((daddr_t *)bp->b_data)[ap->in_off];
229,230c213,214
< ((ufs_daddr_t *)bp->b_data)[bn - 1],
< ((ufs_daddr_t *)bp->b_data)[bn]);
---
> ((daddr_t *)bp->b_data)[bn - 1],
> ((daddr_t *)bp->b_data)[bn]);
257,260c241
< if (ip->i_flags & SF_SNAPSHOT)
< *bnp = blkptrtodb(ump, bn * ump->um_seqinc);
< else
< *bnp = -1;
---
> *bnp = -1;
275c256
< ufs_getlbns(vp, bn, ap, nump)
---
> ext2_getlbns(vp, bn, ap, nump)
277c258
< ufs_daddr_t bn;
---
> daddr_t bn;
282c263
< struct ufsmount *ump;
---
> struct ext2mount *ump;
286c267
< ump = VFSTOUFS(vp->v_mount);
---
> ump = VFSTOEXT2(vp->v_mount);