| ext2_bmap.c (96596) | ext2_bmap.c (96877) |
|---|---|
| 1/* 2 * Copyright (c) 1989, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 | 1/* 2 * Copyright (c) 1989, 1991, 1993 3 * The Regents of the University of California. All rights reserved. 4 * (c) UNIX System Laboratories, Inc. 5 * All or some portions of this file are derived from material licensed 6 * to the University of California by American Telephone and Telegraph 7 * Co. or Unix System Laboratories, Inc. and are reproduced herein with 8 * the permission of UNIX System Laboratories, Inc. --- 22 unchanged lines hidden (view full) --- 31 * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS 32 * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) 33 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT 34 * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY 35 * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 36 * SUCH DAMAGE. 37 * 38 * @(#)ufs_bmap.c 8.7 (Berkeley) 3/21/95 |
| 39 * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_bmap.c 96596 2002-05-14 17:14:01Z iedowse $ | 39 * $FreeBSD: head/sys/gnu/fs/ext2fs/ext2_bmap.c 96877 2002-05-18 19:12:38Z iedowse $ |
| 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/bio.h> 45#include <sys/buf.h> 46#include <sys/proc.h> 47#include <sys/vnode.h> --- 16 unchanged lines hidden (view full) --- 64 struct vnode *a_vp; 65 daddr_t a_bn; 66 struct vnode **a_vpp; 67 daddr_t *a_bnp; 68 int *a_runp; 69 int *a_runb; 70 } */ *ap; 71{ | 40 */ 41 42#include <sys/param.h> 43#include <sys/systm.h> 44#include <sys/bio.h> 45#include <sys/buf.h> 46#include <sys/proc.h> 47#include <sys/vnode.h> --- 16 unchanged lines hidden (view full) --- 64 struct vnode *a_vp; 65 daddr_t a_bn; 66 struct vnode **a_vpp; 67 daddr_t *a_bnp; 68 int *a_runp; 69 int *a_runb; 70 } */ *ap; 71{ |
| 72 daddr_t blkno; | 72 int32_t blkno; |
| 73 int error; 74 75 /* 76 * Check for underlying vnode requests and ensure that logical 77 * to physical mapping is requested. 78 */ 79 if (ap->a_vpp != NULL) 80 *ap->a_vpp = VTOI(ap->a_vp)->i_devvp; --- 18 unchanged lines hidden (view full) --- 99 * array of logical blocks which must be traversed to get to a block. 100 * Each entry contains the offset into that block that gets you to the 101 * next block and the disk address of the block (if it is assigned). 102 */ 103 104int 105ext2_bmaparray(vp, bn, bnp, runp, runb) 106 struct vnode *vp; | 73 int error; 74 75 /* 76 * Check for underlying vnode requests and ensure that logical 77 * to physical mapping is requested. 78 */ 79 if (ap->a_vpp != NULL) 80 *ap->a_vpp = VTOI(ap->a_vp)->i_devvp; --- 18 unchanged lines hidden (view full) --- 99 * array of logical blocks which must be traversed to get to a block. 100 * Each entry contains the offset into that block that gets you to the 101 * next block and the disk address of the block (if it is assigned). 102 */ 103 104int 105ext2_bmaparray(vp, bn, bnp, runp, runb) 106 struct vnode *vp; |
| 107 daddr_t bn; 108 daddr_t *bnp; | 107 int32_t bn; 108 int32_t *bnp; |
| 109 int *runp; 110 int *runb; 111{ 112 struct inode *ip; 113 struct buf *bp; 114 struct ext2mount *ump; 115 struct mount *mp; 116 struct vnode *devvp; 117 struct indir a[NIADDR+1], *ap; | 109 int *runp; 110 int *runb; 111{ 112 struct inode *ip; 113 struct buf *bp; 114 struct ext2mount *ump; 115 struct mount *mp; 116 struct vnode *devvp; 117 struct indir a[NIADDR+1], *ap; |
| 118 daddr_t daddr; | 118 int32_t daddr; |
| 119 long metalbn; 120 int error, num, maxrun = 0; 121 int *nump; 122 123 ap = NULL; 124 ip = VTOI(vp); 125 mp = vp->v_mount; 126 ump = VFSTOEXT2(mp); --- 16 unchanged lines hidden (view full) --- 143 return (error); 144 145 num = *nump; 146 if (num == 0) { 147 *bnp = blkptrtodb(ump, ip->i_db[bn]); 148 if (*bnp == 0) { 149 *bnp = -1; 150 } else if (runp) { | 119 long metalbn; 120 int error, num, maxrun = 0; 121 int *nump; 122 123 ap = NULL; 124 ip = VTOI(vp); 125 mp = vp->v_mount; 126 ump = VFSTOEXT2(mp); --- 16 unchanged lines hidden (view full) --- 143 return (error); 144 145 num = *nump; 146 if (num == 0) { 147 *bnp = blkptrtodb(ump, ip->i_db[bn]); 148 if (*bnp == 0) { 149 *bnp = -1; 150 } else if (runp) { |
| 151 daddr_t bnb = bn; | 151 int32_t bnb = bn; |
| 152 for (++bn; bn < NDADDR && *runp < maxrun && 153 is_sequential(ump, ip->i_db[bn - 1], ip->i_db[bn]); 154 ++bn, ++*runp); 155 bn = bnb; 156 if (runb && (bn > 0)) { 157 for (--bn; (bn >= 0) && (*runb < maxrun) && 158 is_sequential(ump, ip->i_db[bn], 159 ip->i_db[bn+1]); --- 40 unchanged lines hidden (view full) --- 200 curproc->p_stats->p_ru.ru_inblock++; /* XXX */ 201 error = bufwait(bp); 202 if (error) { 203 brelse(bp); 204 return (error); 205 } 206 } 207 | 152 for (++bn; bn < NDADDR && *runp < maxrun && 153 is_sequential(ump, ip->i_db[bn - 1], ip->i_db[bn]); 154 ++bn, ++*runp); 155 bn = bnb; 156 if (runb && (bn > 0)) { 157 for (--bn; (bn >= 0) && (*runb < maxrun) && 158 is_sequential(ump, ip->i_db[bn], 159 ip->i_db[bn+1]); --- 40 unchanged lines hidden (view full) --- 200 curproc->p_stats->p_ru.ru_inblock++; /* XXX */ 201 error = bufwait(bp); 202 if (error) { 203 brelse(bp); 204 return (error); 205 } 206 } 207 |
| 208 daddr = ((daddr_t *)bp->b_data)[ap->in_off]; | 208 daddr = ((int32_t *)bp->b_data)[ap->in_off]; |
| 209 if (num == 1 && daddr && runp) { 210 for (bn = ap->in_off + 1; 211 bn < MNINDIR(ump) && *runp < maxrun && 212 is_sequential(ump, | 209 if (num == 1 && daddr && runp) { 210 for (bn = ap->in_off + 1; 211 bn < MNINDIR(ump) && *runp < maxrun && 212 is_sequential(ump, |
| 213 ((daddr_t *)bp->b_data)[bn - 1], 214 ((daddr_t *)bp->b_data)[bn]); | 213 ((int32_t *)bp->b_data)[bn - 1], 214 ((int32_t *)bp->b_data)[bn]); |
| 215 ++bn, ++*runp); 216 bn = ap->in_off; 217 if (runb && bn) { 218 for(--bn; bn >= 0 && *runb < maxrun && | 215 ++bn, ++*runp); 216 bn = ap->in_off; 217 if (runb && bn) { 218 for(--bn; bn >= 0 && *runb < maxrun && |
| 219 is_sequential(ump, ((daddr_t *)bp->b_data)[bn], 220 ((daddr_t *)bp->b_data)[bn+1]); | 219 is_sequential(ump, ((int32_t *)bp->b_data)[bn], 220 ((int32_t *)bp->b_data)[bn+1]); |
| 221 --bn, ++*runb); 222 } 223 } 224 } 225 if (bp) 226 bqrelse(bp); 227 228 /* --- 21 unchanged lines hidden (view full) --- 250 * triple indirect block and the offset into the inode indirect block array. 251 * Note, the logical block number of the inode single/double/triple indirect 252 * block appears twice in the array, once with the offset into the i_ib and 253 * once with the offset into the page itself. 254 */ 255int 256ext2_getlbns(vp, bn, ap, nump) 257 struct vnode *vp; | 221 --bn, ++*runb); 222 } 223 } 224 } 225 if (bp) 226 bqrelse(bp); 227 228 /* --- 21 unchanged lines hidden (view full) --- 250 * triple indirect block and the offset into the inode indirect block array. 251 * Note, the logical block number of the inode single/double/triple indirect 252 * block appears twice in the array, once with the offset into the i_ib and 253 * once with the offset into the page itself. 254 */ 255int 256ext2_getlbns(vp, bn, ap, nump) 257 struct vnode *vp; |
| 258 daddr_t bn; | 258 int32_t bn; |
| 259 struct indir *ap; 260 int *nump; 261{ 262 long blockcnt, metalbn, realbn; 263 struct ext2mount *ump; 264 int i, numlevels, off; 265 int64_t qblockcnt; 266 --- 68 unchanged lines hidden --- | 259 struct indir *ap; 260 int *nump; 261{ 262 long blockcnt, metalbn, realbn; 263 struct ext2mount *ump; 264 int i, numlevels, off; 265 int64_t qblockcnt; 266 --- 68 unchanged lines hidden --- |