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

* git://git.linux-nfs.org/pub/linux/nfs-2.6: (118 commits)
  NFSv4: Iterate through all nfs_clients when the server recalls a delegation
  NFSv4: Deal more correctly with duplicate delegations
  NFS: Fix a potential race between umount and nfs_access_cache_shrinker()
  NFS: Add an asynchronous delegreturn operation for use in nfs_clear_inode
  nfs: convert NFS_*(inode) helpers to static inline
  nfs: obliterate NFS_FLAGS macro
  NFS: Address memory leaks in the NFS client mount option parser
  nfs4: allow nfsv4 acls on non-regular-files
  NFS: Optimise away the sigmask code in aio/dio reads and writes
  SUNRPC: Don't bother changing the sigmask for asynchronous RPC calls
  SUNRPC: rpcb_getport_sync() passes incorrect address size to rpc_create()
  SUNRPC: Clean up block comment preceding rpcb_getport_sync()
  SUNRPC: Use appropriate argument types in rpcb client
  SUNRPC: rpcb_getport_sync() should use built-in hostname generator
  SUNRPC: Clean up functions that free address_strings array
  NFS: NFS version number is unsigned
  NLM: Fix a bogus 'return' in nlmclnt_rpc_release
  NLM: Introduce an arguments structure for nlmclnt_init()
  NLM/NFS: Use cached nlm_host when calling nlmclnt_proc()
  NFS: Invoke nlmclnt_init during NFS mount processing
  ...

1 files changed, 17 insertions, 23 deletions

diff --git a/fs/nfs/file.c b/fs/nfs/file.c
index b3bb89f7d5d2..ef57a5ae5904 100644
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@ -349,7 +349,9 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,
         unlock_page(page);
         page_cache_release(page);
 
-        return status < 0 ? status : copied;
+        if (status < 0)
+                return status;
+        return copied;
 }
 
 static void nfs_invalidate_page(struct page *page, unsigned long offset)
@@ -392,35 +394,27 @@ static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct page *page)
         struct file *filp = vma->vm_file;
         unsigned pagelen;
         int ret = -EINVAL;
-        void *fsdata;
         struct address_space *mapping;
-        loff_t offset;
 
         lock_page(page);
         mapping = page->mapping;
-        if (mapping != vma->vm_file->f_path.dentry->d_inode->i_mapping) {
-                unlock_page(page);
-                return -EINVAL;
-        }
+        if (mapping != vma->vm_file->f_path.dentry->d_inode->i_mapping)
+                goto out_unlock;
+
+        ret = 0;
         pagelen = nfs_page_length(page);
-        offset = (loff_t)page->index << PAGE_CACHE_SHIFT;
-        unlock_page(page);
+        if (pagelen == 0)
+                goto out_unlock;
 
-        /*
-         * we can use mapping after releasing the page lock, because:
-         * we hold mmap_sem on the fault path, which should pin the vma
-         * which should pin the file, which pins the dentry which should
-         * hold a reference on inode.
-         */
+        ret = nfs_flush_incompatible(filp, page);
+        if (ret != 0)
+                goto out_unlock;
 
-        if (pagelen) {
-                struct page *page2 = NULL;
-                ret = nfs_write_begin(filp, mapping, offset, pagelen,
-                                0, &page2, &fsdata);
-                if (!ret)
-                        ret = nfs_write_end(filp, mapping, offset, pagelen,
-                                        pagelen, page2, fsdata);
-        }
+        ret = nfs_updatepage(filp, page, 0, pagelen);
+        if (ret == 0)
+                ret = pagelen;
+out_unlock:
+        unlock_page(page);
         return ret;
 }