diff --git a/[refs] b/[refs]
index c2a8d3c1e1f2..ee9296b3fbe9 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 7bab377fcb495ee2e5a1cd69d235f8d84c76e3af
+refs/heads/master: 755c1e20cd2ad56e5c567fa05769eb98a3eef72b
diff --git a/trunk/fs/nfs/inode.c b/trunk/fs/nfs/inode.c
index 8d5b6691ae3d..5746dc841a6c 100644
--- a/trunk/fs/nfs/inode.c
+++ b/trunk/fs/nfs/inode.c
@@ -859,11 +859,9 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
 
 	lock_kernel();
 	nfs_begin_data_update(inode);
-	/* Write all dirty data if we're changing file permissions or size */
-	if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID|ATTR_SIZE)) != 0) {
-		filemap_write_and_wait(inode->i_mapping);
-		nfs_wb_all(inode);
-	}
+	/* Write all dirty data */
+	filemap_write_and_wait(inode->i_mapping);
+	nfs_wb_all(inode);
 	/*
 	 * Return any delegations if we're going to change ACLs
 	 */