3 files changed, 21 insertions, 6 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 3ddda6f7ecc2..e7ffb4deb3e5 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -690,7 +690,9 @@ int nfs_lookup_verify_inode(struct inode *inode, struct nameidata *nd)
                         goto out_force;
                 /* This is an open(2) */
                 if (nfs_lookup_check_intent(nd, LOOKUP_OPEN) != 0 &&
-                                !(server->flags & NFS_MOUNT_NOCTO))
+                                !(server->flags & NFS_MOUNT_NOCTO) &&
+                                (S_ISREG(inode->i_mode) ||
+                                 S_ISDIR(inode->i_mode)))
                         goto out_force;
         }
         return nfs_revalidate_inode(server, inode);
diff --git a/fs/nfs/write.c b/fs/nfs/write.c
index bca5734ca9fb..86bac6a5008e 100644
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@ -578,7 +578,7 @@ static int nfs_wait_on_requests(struct inode *inode, unsigned long idx_start, un
         return ret;
 }
 
-static void nfs_cancel_requests(struct list_head *head)
+static void nfs_cancel_dirty_list(struct list_head *head)
 {
         struct nfs_page *req;
         while(!list_empty(head)) {
@@ -589,6 +589,19 @@ static void nfs_cancel_requests(struct list_head *head)
         }
 }
 
+static void nfs_cancel_commit_list(struct list_head *head)
+{
+        struct nfs_page *req;
+
+        while(!list_empty(head)) {
+                req = nfs_list_entry(head->next);
+                nfs_list_remove_request(req);
+                nfs_inode_remove_request(req);
+                nfs_clear_page_writeback(req);
+                dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
+        }
+}
+
 /*
  * nfs_scan_dirty - Scan an inode for dirty requests
  * @inode: NFS inode to scan
@@ -1381,6 +1394,7 @@ nfs_commit_list(struct inode *inode, struct list_head *head, int how)
                 nfs_list_remove_request(req);
                 nfs_mark_request_commit(req);
                 nfs_clear_page_writeback(req);
+                dec_zone_page_state(req->wb_page, NR_UNSTABLE_NFS);
         }
         return -ENOMEM;
 }
@@ -1499,7 +1513,7 @@ int nfs_sync_inode_wait(struct inode *inode, unsigned long idx_start,
                 if (pages != 0) {
                         spin_unlock(&nfsi->req_lock);
                         if (how & FLUSH_INVALIDATE)
-                                nfs_cancel_requests(&head);
+                                nfs_cancel_dirty_list(&head);
                         else
                                 ret = nfs_flush_list(inode, &head, pages, how);
                         spin_lock(&nfsi->req_lock);
@@ -1512,7 +1526,7 @@ int nfs_sync_inode_wait(struct inode *inode, unsigned long idx_start,
                         break;
                 if (how & FLUSH_INVALIDATE) {
                         spin_unlock(&nfsi->req_lock);
-                        nfs_cancel_requests(&head);
+                        nfs_cancel_commit_list(&head);
                         spin_lock(&nfsi->req_lock);
                         continue;
                 }
diff --git a/net/sunrpc/xdr.c b/net/sunrpc/xdr.c
index 49174f0d0a3e..6ac45103a272 100644
--- a/net/sunrpc/xdr.c
+++ b/net/sunrpc/xdr.c
@@ -191,7 +191,6 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base,
         do {
                 /* Are any pointers crossing a page boundary? */
                 if (pgto_base == 0) {
-                        flush_dcache_page(*pgto);
                         pgto_base = PAGE_CACHE_SIZE;
                         pgto--;
                 }
@@ -211,11 +210,11 @@ _shift_data_right_pages(struct page **pages, size_t pgto_base,
                 vto = kmap_atomic(*pgto, KM_USER0);
                 vfrom = kmap_atomic(*pgfrom, KM_USER1);
                 memmove(vto + pgto_base, vfrom + pgfrom_base, copy);
+                flush_dcache_page(*pgto);
                 kunmap_atomic(vfrom, KM_USER1);
                 kunmap_atomic(vto, KM_USER0);
 
         } while ((len -= copy) != 0);
-        flush_dcache_page(*pgto);
 }
 
 /*