version 1.132, 2014/06/03 19:30:30 |
version 1.132.4.1, 2015/04/06 15:18:33 |
Line 1182 ufs_dirempty(struct inode *ip, ino_t par |
|
Line 1182 ufs_dirempty(struct inode *ip, ino_t par |
|
|
|
for (off = 0; off < ip->i_size; |
for (off = 0; off < ip->i_size; |
off += ufs_rw16(dp->d_reclen, needswap)) { |
off += ufs_rw16(dp->d_reclen, needswap)) { |
error = vn_rdwr(UIO_READ, ITOV(ip), (void *)dp, MINDIRSIZ, off, |
error = ufs_bufio(UIO_READ, ITOV(ip), (void *)dp, MINDIRSIZ, |
UIO_SYSSPACE, IO_NODELOCKED, cred, &count, NULL); |
off, IO_NODELOCKED, cred, &count, NULL); |
/* |
/* |
* Since we read MINDIRSIZ, residual must |
* Since we read MINDIRSIZ, residual must |
* be 0 unless we're at end of file. |
* be 0 unless we're at end of file. |
Line 1279 ufs_blkatoff(struct vnode *vp, off_t off |
|
Line 1279 ufs_blkatoff(struct vnode *vp, off_t off |
|
} |
} |
KASSERT(run >= 1); |
KASSERT(run >= 1); |
error = breadn(vp, blks[0], blksizes[0], &blks[1], &blksizes[1], |
error = breadn(vp, blks[0], blksizes[0], &blks[1], &blksizes[1], |
run - 1, NOCRED, (modify ? B_MODIFY : 0), &bp); |
run - 1, (modify ? B_MODIFY : 0), &bp); |
if (error != 0) { |
if (error != 0) { |
*bpp = NULL; |
*bpp = NULL; |
goto out; |
goto out; |