1 files changed, 6 insertions, 3 deletions

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index af53c02f473b..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
          */
@@ -429,7 +431,8 @@ int nfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat)
         int err;
 
         /* Flush out writes to the server in order to update c/mtime */
-        nfs_sync_mapping_range(inode->i_mapping, 0, 0, FLUSH_NOCOMMIT);
+        if (S_ISREG(inode->i_mode))
+                nfs_sync_mapping_range(inode->i_mapping, 0, 0, FLUSH_NOCOMMIT);
 
         /*
          * We may force a getattr if the user cares about atime.