cleanup readability syntax prior to ongoing b_resid work commits.
MFC after: 1 day
This commit is contained in:
parent
8dfde376a3
commit
e05fb41e7e
@ -239,12 +239,12 @@ READ(ap)
|
||||
if (bytesinfile < xfersize)
|
||||
xfersize = bytesinfile;
|
||||
|
||||
if (lblktosize(fs, nextlbn) >= ip->i_size)
|
||||
if (lblktosize(fs, nextlbn) >= ip->i_size) {
|
||||
/*
|
||||
* Don't do readahead if this is the end of the file.
|
||||
*/
|
||||
error = bread(vp, lbn, size, NOCRED, &bp);
|
||||
else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0)
|
||||
} else if ((vp->v_mount->mnt_flag & MNT_NOCLUSTERR) == 0) {
|
||||
/*
|
||||
* Otherwise if we are allowed to cluster,
|
||||
* grab as much as we can.
|
||||
@ -254,7 +254,7 @@ READ(ap)
|
||||
*/
|
||||
error = cluster_read(vp, ip->i_size, lbn,
|
||||
size, NOCRED, uio->uio_resid, seqcount, &bp);
|
||||
else if (seqcount > 1) {
|
||||
} else if (seqcount > 1) {
|
||||
/*
|
||||
* If we are NOT allowed to cluster, then
|
||||
* if we appear to be acting sequentially,
|
||||
@ -266,13 +266,14 @@ READ(ap)
|
||||
int nextsize = BLKSIZE(fs, ip, nextlbn);
|
||||
error = breadn(vp, lbn,
|
||||
size, &nextlbn, &nextsize, 1, NOCRED, &bp);
|
||||
} else
|
||||
} else {
|
||||
/*
|
||||
* Failing all of the above, just read what the
|
||||
* user asked for. Interestingly, the same as
|
||||
* the first option above.
|
||||
*/
|
||||
error = bread(vp, lbn, size, NOCRED, &bp);
|
||||
}
|
||||
if (error) {
|
||||
brelse(bp);
|
||||
bp = NULL;
|
||||
|
Loading…
x
Reference in New Issue
Block a user