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

Convert two instances of a lseek()+read() combination to a pread().

Browse Source 
PR:		bin/17640
MFC after:	2 weeks
This commit is contained in:
mikeh 2001-07-01 04:46:20 +00:00
parent d5219f43a7
commit 1219a35719
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
sbin/dump/traverse.c
View File

@ -601,10 +601,8 @@ bread(blkno, buf, size)
int cnt, i;
loop:
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
((off_t)blkno << dev_bshift))
msg("bread: lseek fails\n");
if ((cnt = read(diskfd, buf, size)) == size)
if ((cnt = pread(diskfd, buf, size, ((off_t)blkno << dev_bshift))) ==
size)
return;
if (blkno + (size / dev_bsize) > fsbtodb(sblock, sblock->fs_size)) {
/*
@ -642,10 +640,8 @@ bread(blkno, buf, size)
*/
memset(buf, 0, size);
for (i = 0; i < size; i += dev_bsize, buf += dev_bsize, blkno++) {
if (lseek(diskfd, ((off_t)blkno << dev_bshift), 0) !=
((off_t)blkno << dev_bshift))
msg("bread: lseek2 fails!\n");
if ((cnt = read(diskfd, buf, (int)dev_bsize)) == dev_bsize)
if ((cnt = pread(diskfd, buf, (int)dev_bsize,
((off_t)blkno << dev_bshift))) == dev_bsize)
continue;
if (cnt == -1) {
msg("read error from %s: %s: [sector %d]: count=%d\n",