d/freebsd-nq
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix the zeroing loop. I must have been drunk when I wrote this...

Browse Source 
MFC after:	3 days
This commit is contained in:
Dag-Erling Smørgrav 2013-08-20 07:19:58 +00:00
parent b98940e5eb
commit 8ce80d4bd4
1 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/fsck_ffs/fsutil.c
View File

@ -629,6 +629,10 @@ blerase(int fd, ufs2_daddr_t blk, long size)
return;
}
/*
* Fill a contiguous region with all-zeroes. Note ZEROBUFSIZE is by
* definition a multiple of dev_bsize.
*/
void
blzero(int fd, ufs2_daddr_t blk, long size)
{
@ -637,9 +641,8 @@ blzero(int fd, ufs2_daddr_t blk, long size)
if (fd < 0)
return;
len = ZEROBUFSIZE;
if (zero == NULL) {
zero = calloc(len, 1);
zero = calloc(ZEROBUFSIZE, 1);
if (zero == NULL)
errx(EEXIT, "cannot allocate buffer pool");
}
@ -647,10 +650,7 @@ blzero(int fd, ufs2_daddr_t blk, long size)
if (lseek(fd, offset, 0) < 0)
rwerror("SEEK BLK", blk);
while (size > 0) {
if (size > len)
size = len;
else
len = size;
len = size > ZEROBUFSIZE ? ZEROBUFSIZE : size;
if (write(fd, zero, len) != len)
rwerror("WRITE BLK", blk);
blk += len / dev_bsize;