diff options
| author | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
|---|---|---|
| committer | Ralf Baechle <ralf@linux-mips.org> | 2000-01-29 01:41:54 +0000 |
| commit | f969d69ba9f952e5bdd38278e25e26a3e4a61a70 (patch) | |
| tree | b3530d803df59d726afaabebc6626987dee1ca05 /fs/nfs/read.c | |
| parent | a10ce7ef2066b455d69187643ddf2073bfc4db24 (diff) | |
Merge with 2.3.27.
Diffstat (limited to 'fs/nfs/read.c')
| -rw-r--r-- | fs/nfs/read.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c index a85ef5e74..6b2e3d73a 100644 --- a/fs/nfs/read.c +++ b/fs/nfs/read.c @@ -70,7 +70,7 @@ static int nfs_readpage_sync(struct dentry *dentry, struct inode *inode, struct page *page) { struct nfs_rreq rqst; - unsigned long offset = page->offset; + unsigned long offset = page->index << PAGE_CACHE_SHIFT; char *buffer = (char *) page_address(page); int rsize = NFS_SERVER(inode)->rsize; int result, refresh = 0; @@ -179,7 +179,7 @@ nfs_readpage_async(struct dentry *dentry, struct inode *inode, /* Initialize request */ /* N.B. Will the dentry remain valid for life of request? */ - nfs_readreq_setup(req, NFS_FH(dentry), page->offset, + nfs_readreq_setup(req, NFS_FH(dentry), page->index << PAGE_CACHE_SHIFT, (void *) address, PAGE_SIZE); req->ra_inode = inode; req->ra_page = page; /* count has been incremented by caller */ @@ -224,8 +224,8 @@ nfs_readpage(struct file *file, struct page *page) int error; lock_kernel(); - dprintk("NFS: nfs_readpage (%p %ld@%ld)\n", - page, PAGE_SIZE, page->offset); + dprintk("NFS: nfs_readpage (%p %ld@%lu)\n", + page, PAGE_SIZE, page->index); get_page(page); /* |