xnu-344.23.tar.gz

[apple/xnu.git] / bsd / nfs / nfs_bio.c

diff --git a/bsd/nfs/nfs_bio.c b/bsd/nfs/nfs_bio.c
index 7a7394c7869f4d6be5396dcf550d21c4dae5ecbe..4b77d663733ddb4c5d212242b39db23281d2b1db 100644 (file)
--- a/bsd/nfs/nfs_bio.c
+++ b/bsd/nfs/nfs_bio.c
@@ -115,7 +115,8 @@ nfs_bioread(vp, uio, ioflag, cred, getpages)
        int getpages;
 {
        register struct nfsnode *np = VTONFS(vp);
        int getpages;
 {
        register struct nfsnode *np = VTONFS(vp);

-       register int biosize, diff, i;
+       register int biosize, i;
+       off_t diff;

        struct buf *bp = 0, *rabp;
        struct vattr vattr;
        struct proc *p;
        struct buf *bp = 0, *rabp;
        struct vattr vattr;
        struct proc *p;


@@ -268,7 +269,7 @@ again:
                bufsize = biosize;
                if ((off_t)(lbn + 1) * biosize > np->n_size && 
                    (off_t)(lbn + 1) * biosize - np->n_size < biosize) {
                bufsize = biosize;
                if ((off_t)(lbn + 1) * biosize > np->n_size && 
                    (off_t)(lbn + 1) * biosize - np->n_size < biosize) {

-                       bufsize = np->n_size - lbn * biosize;
+                       bufsize = np->n_size - (off_t)lbn * biosize;

                        bufsize = (bufsize + DEV_BSIZE - 1) & ~(DEV_BSIZE - 1);
                }
                bp = nfs_getcacheblk(vp, lbn, bufsize, p, operation);
                        bufsize = (bufsize + DEV_BSIZE - 1) & ~(DEV_BSIZE - 1);
                }
                bp = nfs_getcacheblk(vp, lbn, bufsize, p, operation);


@@ -876,7 +877,7 @@ nfs_getcacheblk(vp, bn, size, p, operation)
                bp = getblk(vp, bn, size, 0, 0, operation);
 
        if( vp->v_type == VREG)
                bp = getblk(vp, bn, size, 0, 0, operation);
 
        if( vp->v_type == VREG)

-               bp->b_blkno = (bn * biosize) / DEV_BSIZE;
+               bp->b_blkno = ((off_t)bn * biosize) / DEV_BSIZE;

 
        return (bp);
 }
 
        return (bp);
 }