cd9660_vnops.c (552311f4bb98c81b1b9e0e81d74e0262fc12110b) | cd9660_vnops.c (cc4916adf2c3f310008e78adb40a94238724d606) |
---|---|
1/*- 2 * Copyright (c) 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 327 unchanged lines hidden (view full) --- 336 if (seqcount > 1 && 337 lblktosize(imp, rablock) < ip->i_size) { 338 rasize = blksize(imp, ip, rablock); 339 error = breadn(vp, lbn, size, &rablock, 340 &rasize, 1, NOCRED, &bp); 341 } else 342 error = bread(vp, lbn, size, NOCRED, &bp); 343 } | 1/*- 2 * Copyright (c) 1994 3 * The Regents of the University of California. All rights reserved. 4 * 5 * This code is derived from software contributed to Berkeley 6 * by Pace Willisson (pace@blitz.com). The Rock Ridge Extension 7 * Support code is derived from software contributed to Berkeley 8 * by Atsushi Murai (amurai@spec.co.jp). --- 327 unchanged lines hidden (view full) --- 336 if (seqcount > 1 && 337 lblktosize(imp, rablock) < ip->i_size) { 338 rasize = blksize(imp, ip, rablock); 339 error = breadn(vp, lbn, size, &rablock, 340 &rasize, 1, NOCRED, &bp); 341 } else 342 error = bread(vp, lbn, size, NOCRED, &bp); 343 } |
344 n = MIN(n, size - bp->b_resid); 345 if (error) { 346 brelse(bp); | 344 if (error != 0) |
347 return (error); | 345 return (error); |
348 } | 346 n = MIN(n, size - bp->b_resid); |
349 350 error = uiomove(bp->b_data + on, (int)n, uio); 351 brelse(bp); 352 } while (error == 0 && uio->uio_resid > 0 && n != 0); 353 return (error); 354} 355 356/* --- 520 unchanged lines hidden --- | 347 348 error = uiomove(bp->b_data + on, (int)n, uio); 349 brelse(bp); 350 } while (error == 0 && uio->uio_resid > 0 && n != 0); 351 return (error); 352} 353 354/* --- 520 unchanged lines hidden --- |