aboutsummaryrefslogtreecommitdiffstats
path: root/fs/nfs/read.c
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2007-08-10 17:44:32 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2007-10-09 17:18:31 -0400
commitcd3758e37ddea66fccca7d93c4b601e8a2e51926 (patch)
tree07566d3ee457524a97b534a4f214b9178b1278c8 /fs/nfs/read.c
parentc03025d55540bd648f2546659090140ecc835572 (diff)
NFS: Replace file->private_data with calls to nfs_file_open_context()
Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
Diffstat (limited to 'fs/nfs/read.c')
-rw-r--r--fs/nfs/read.c6
1 files changed, 2 insertions, 4 deletions
diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 19e05633f4e3..d6e62d7afc72 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -497,8 +497,7 @@ int nfs_readpage(struct file *file, struct page *page)
497 if (ctx == NULL) 497 if (ctx == NULL)
498 goto out_unlock; 498 goto out_unlock;
499 } else 499 } else
500 ctx = get_nfs_open_context((struct nfs_open_context *) 500 ctx = get_nfs_open_context(nfs_file_open_context(file));
501 file->private_data);
502 501
503 error = nfs_readpage_async(ctx, inode, page); 502 error = nfs_readpage_async(ctx, inode, page);
504 503
@@ -576,8 +575,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
576 if (desc.ctx == NULL) 575 if (desc.ctx == NULL)
577 return -EBADF; 576 return -EBADF;
578 } else 577 } else
579 desc.ctx = get_nfs_open_context((struct nfs_open_context *) 578 desc.ctx = get_nfs_open_context(nfs_file_open_context(filp));
580 filp->private_data);
581 if (rsize < PAGE_CACHE_SIZE) 579 if (rsize < PAGE_CACHE_SIZE)
582 nfs_pageio_init(&pgio, inode, nfs_pagein_multi, rsize, 0); 580 nfs_pageio_init(&pgio, inode, nfs_pagein_multi, rsize, 0);
583 else 581 else