2 files changed, 6 insertions, 3 deletions

diff --git a/fs/nfs/dir.c b/fs/nfs/dir.c
index 92d8ec859e22..cd3469720cbf 100644
--- a/fs/nfs/dir.c
+++ b/fs/nfs/dir.c
@@ -1684,7 +1684,8 @@ go_ahead:
          * ... prune child dentries and writebacks if needed.
          */
         if (atomic_read(&old_dentry->d_count) > 1) {
-                nfs_wb_all(old_inode);
+                if (S_ISREG(old_inode->i_mode))
+                        nfs_wb_all(old_inode);
                 shrink_dcache_parent(old_dentry);
         }
         nfs_inode_return_delegation(old_inode);
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 93d046c85f52..44aa9b726573 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -341,8 +341,10 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
         lock_kernel();
         nfs_begin_data_update(inode);
         /* Write all dirty data */
-        filemap_write_and_wait(inode->i_mapping);
-        nfs_wb_all(inode);
+        if (S_ISREG(inode->i_mode)) {
+                filemap_write_and_wait(inode->i_mapping);
+                nfs_wb_all(inode);
+        }
         /*
          * Return any delegations if we're going to change ACLs
          */