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

Fix remainder calculation when biosize is not a power of 2

Browse Source 
In common configurations biosize is a power of two, but is not required to
be so.  Thanks to markj@ for spotting an additional case beyond my original
patch.

Reviewed by: rmacklem@
This commit is contained in:
Ed Maste 2013-03-19 13:06:11 +00:00
parent 565d8205f3
commit 96ecfd9813
2 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
sys/fs/nfsclient/nfs_clbio.c
View File

@ -484,7 +484,7 @@ ncl_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
case VREG: case VREG:
NFSINCRGLOBAL(newnfsstats.biocache_reads); NFSINCRGLOBAL(newnfsstats.biocache_reads);
lbn = uio->uio_offset / biosize; lbn = uio->uio_offset / biosize;
on = uio->uio_offset & (biosize - 1); on = uio->uio_offset - (lbn * biosize);
/* /*
* Start the read ahead(s), as required. * Start the read ahead(s), as required.
@ -1029,7 +1029,7 @@ flush_and_restart:
do { do {
NFSINCRGLOBAL(newnfsstats.biocache_writes); NFSINCRGLOBAL(newnfsstats.biocache_writes);
lbn = uio->uio_offset / biosize; lbn = uio->uio_offset / biosize;
on = uio->uio_offset & (biosize-1); on = uio->uio_offset - (lbn * biosize);
n = MIN((unsigned)(biosize - on), uio->uio_resid); n = MIN((unsigned)(biosize - on), uio->uio_resid);
again: again:
/* /*
@ -1847,7 +1847,7 @@ ncl_meta_setsize(struct vnode *vp, struct ucred *cred, struct thread *td, u_quad
*/ */
error = vtruncbuf(vp, cred, nsize, biosize); error = vtruncbuf(vp, cred, nsize, biosize);
lbn = nsize / biosize; lbn = nsize / biosize;
bufsize = nsize & (biosize - 1); bufsize = nsize - (lbn * biosize);
bp = nfs_getcacheblk(vp, lbn, bufsize, td); bp = nfs_getcacheblk(vp, lbn, bufsize, td);
if (!bp) if (!bp)
return EINTR; return EINTR;

6
sys/nfsclient/nfs_bio.c
View File

@ -475,7 +475,7 @@ nfs_bioread(struct vnode *vp, struct uio *uio, int ioflag, struct ucred *cred)
case VREG: case VREG:
nfsstats.biocache_reads++; nfsstats.biocache_reads++;
lbn = uio->uio_offset / biosize; lbn = uio->uio_offset / biosize;
on = uio->uio_offset & (biosize - 1); on = uio->uio_offset - (lbn * biosize);
/* /*
* Start the read ahead(s), as required. * Start the read ahead(s), as required.
@ -1011,7 +1011,7 @@ flush_and_restart:
do { do {
nfsstats.biocache_writes++; nfsstats.biocache_writes++;
lbn = uio->uio_offset / biosize; lbn = uio->uio_offset / biosize;
on = uio->uio_offset & (biosize-1); on = uio->uio_offset - (lbn * biosize);
n = MIN((unsigned)(biosize - on), uio->uio_resid); n = MIN((unsigned)(biosize - on), uio->uio_resid);
again: again:
/* /*
@ -1781,7 +1781,7 @@ nfs_meta_setsize(struct vnode *vp, struct ucred *cred, struct thread *td, u_quad
*/ */
error = vtruncbuf(vp, cred, nsize, biosize); error = vtruncbuf(vp, cred, nsize, biosize);
lbn = nsize / biosize; lbn = nsize / biosize;
bufsize = nsize & (biosize - 1); bufsize = nsize - (lbn * biosize);
bp = nfs_getcacheblk(vp, lbn, bufsize, td); bp = nfs_getcacheblk(vp, lbn, bufsize, td);
if (!bp) if (!bp)
return EINTR; return EINTR;