Merge master.kernel.org:/home/rmk/linux-2.6-mmc

[linux-2.6] / fs / nfs / read.c

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 43b03b19731b52bfeabfe0b063e9bc70e9d07e2d..5f20eafba8ecb077e40c593c841a24401f39682a 100644 (file)
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -507,7 +507,7 @@ int nfs_readpage(struct file *file, struct page *page)
                goto out_error;
 
        if (file == NULL) {
-               ctx = nfs_find_open_context(inode, FMODE_READ);
+               ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
                if (ctx == NULL)
                        return -EBADF;
        } else
@@ -576,7 +576,7 @@ int nfs_readpages(struct file *filp, struct address_space *mapping,
                        nr_pages);
 
        if (filp == NULL) {
-               desc.ctx = nfs_find_open_context(inode, FMODE_READ);
+               desc.ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
                if (desc.ctx == NULL)
                        return -EBADF;
        } else