Merge git://git.linux-nfs.org/pub/linux/nfs-2.6

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (122 commits)
  sunrpc: drop BKL around wrap and unwrap
  NFSv4: Make sure unlock is really an unlock when cancelling a lock
  NLM: fix source address of callback to client
  SUNRPC client: add interface for binding to a local address
  SUNRPC server: record the destination address of a request
  SUNRPC: cleanup transport creation argument passing
  NFSv4: Make the NFS state model work with the nosharedcache mount option
  NFS: Error when mounting the same filesystem with different options
  NFS: Add the mount option "nosharecache"
  NFS: Add support for mounting NFSv4 file systems with string options
  NFS: Add final pieces to support in-kernel mount option parsing
  NFS: Introduce generic mount client API
  NFS: Add enums and match tables for mount option parsing
  NFS: Improve debugging output in NFS in-kernel mount client
  NFS: Clean up in-kernel NFS mount
  NFS: Remake nfsroot_mount as a permanent part of NFS client
  SUNRPC: Add a convenient default for the hostname when calling rpc_create()
  SUNRPC: Rename rpcb_getport to be consistent with new rpcb_getport_sync name
  SUNRPC: Rename rpcb_getport_external routine
  SUNRPC: Allow rpcbind requests to be interrupted by a signal.
  ...

1 files changed, 26 insertions, 14 deletions

diff --git a/fs/nfs/read.c b/fs/nfs/read.c
index 7bd7cb95c034..6ae2e58ed05a 100644
--- a/fs/nfs/read.c
+++ b/fs/nfs/read.c
@@ -145,8 +145,8 @@ static void nfs_readpage_release(struct nfs_page *req)
         unlock_page(req->wb_page);
 
         dprintk("NFS: read done (%s/%Ld %d@%Ld)\n",
-                        req->wb_context->dentry->d_inode->i_sb->s_id,
-                        (long long)NFS_FILEID(req->wb_context->dentry->d_inode),
+                        req->wb_context->path.dentry->d_inode->i_sb->s_id,
+                        (long long)NFS_FILEID(req->wb_context->path.dentry->d_inode),
                         req->wb_bytes,
                         (long long)req_offset(req));
         nfs_clear_request(req);
@@ -164,7 +164,7 @@ static void nfs_read_rpcsetup(struct nfs_page *req, struct nfs_read_data *data,
         int flags;
 
         data->req         = req;
-        data->inode       = inode = req->wb_context->dentry->d_inode;
+        data->inode       = inode = req->wb_context->path.dentry->d_inode;
         data->cred        = req->wb_context->cred;
 
         data->args.fh     = NFS_FH(inode);
@@ -483,17 +483,19 @@ int nfs_readpage(struct file *file, struct page *page)
          */
         error = nfs_wb_page(inode, page);
         if (error)
-                goto out_error;
+                goto out_unlock;
+        if (PageUptodate(page))
+                goto out_unlock;
 
         error = -ESTALE;
         if (NFS_STALE(inode))
-                goto out_error;
+                goto out_unlock;
 
         if (file == NULL) {
                 error = -EBADF;
                 ctx = nfs_find_open_context(inode, NULL, FMODE_READ);
                 if (ctx == NULL)
-                        goto out_error;
+                        goto out_unlock;
         } else
                 ctx = get_nfs_open_context((struct nfs_open_context *)
                                 file->private_data);
@@ -502,8 +504,7 @@ int nfs_readpage(struct file *file, struct page *page)
 
         put_nfs_open_context(ctx);
         return error;
-
-out_error:
+out_unlock:
         unlock_page(page);
         return error;
 }
@@ -520,21 +521,32 @@ readpage_async_filler(void *data, struct page *page)
         struct inode *inode = page->mapping->host;
         struct nfs_page *new;
         unsigned int len;
+        int error;
+
+        error = nfs_wb_page(inode, page);
+        if (error)
+                goto out_unlock;
+        if (PageUptodate(page))
+                goto out_unlock;
 
-        nfs_wb_page(inode, page);
         len = nfs_page_length(page);
         if (len == 0)
                 return nfs_return_empty_page(page);
+
         new = nfs_create_request(desc->ctx, inode, page, 0, len);
-        if (IS_ERR(new)) {
-                        SetPageError(page);
-                        unlock_page(page);
-                        return PTR_ERR(new);
-        }
+        if (IS_ERR(new))
+                goto out_error;
+
         if (len < PAGE_CACHE_SIZE)
                 zero_user_page(page, len, PAGE_CACHE_SIZE - len, KM_USER0);
         nfs_pageio_add_request(desc->pgio, new);
         return 0;
+out_error:
+        error = PTR_ERR(new);
+        SetPageError(page);
+out_unlock:
+        unlock_page(page);
+        return error;
 }
 
 int nfs_readpages(struct file *filp, struct address_space *mapping,