version 1.20.4.1, 2008/02/18 21:07:32 |
version 1.22, 2008/05/16 09:22:01 |
Line 219 ufsdirhash_build(struct inode *ip) |
|
Line 219 ufsdirhash_build(struct inode *ip) |
|
if ((pos & bmask) == 0) { |
if ((pos & bmask) == 0) { |
if (bp != NULL) |
if (bp != NULL) |
brelse(bp, 0); |
brelse(bp, 0); |
if (ufs_blkatoff(vp, (off_t)pos, NULL, &bp) != 0) |
if (ufs_blkatoff(vp, (off_t)pos, NULL, &bp, false) != 0) |
goto fail; |
goto fail; |
} |
} |
|
|
|
|
if (bp != NULL) |
if (bp != NULL) |
brelse(bp, 0); |
brelse(bp, 0); |
blkoff = offset & ~bmask; |
blkoff = offset & ~bmask; |
if (ufs_blkatoff(vp, (off_t)blkoff, NULL, &bp) != 0) |
if (ufs_blkatoff(vp, (off_t)blkoff, |
|
NULL, &bp, true) != 0) |
return (EJUSTRETURN); |
return (EJUSTRETURN); |
} |
} |
dp = (struct direct *)((char *)bp->b_data + (offset & bmask)); |
dp = (struct direct *)((char *)bp->b_data + (offset & bmask)); |
Line 525 ufsdirhash_findfree(struct inode *ip, in |
|
Line 526 ufsdirhash_findfree(struct inode *ip, in |
|
dh->dh_blkfree[dirblock] >= howmany(slotneeded, DIRALIGN)); |
dh->dh_blkfree[dirblock] >= howmany(slotneeded, DIRALIGN)); |
DIRHASH_UNLOCK(dh); |
DIRHASH_UNLOCK(dh); |
pos = dirblock * dirblksiz; |
pos = dirblock * dirblksiz; |
error = ufs_blkatoff(ip->i_vnode, (off_t)pos, (void *)&dp, &bp); |
error = ufs_blkatoff(ip->i_vnode, (off_t)pos, (void *)&dp, &bp, false); |
if (error) |
if (error) |
return (-1); |
return (-1); |
/* Find the first entry with free space. */ |
/* Find the first entry with free space. */ |