|
@@ -2549,6 +2549,14 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
|
|
|
|
|
|
nfs_fattr_init(fattr);
|
|
|
|
|
|
+ /* Deal with open(O_TRUNC) */
|
|
|
+ if (sattr->ia_valid & ATTR_OPEN)
|
|
|
+ sattr->ia_valid &= ~(ATTR_MTIME|ATTR_CTIME|ATTR_OPEN);
|
|
|
+
|
|
|
+ /* Optimization: if the end result is no change, don't RPC */
|
|
|
+ if ((sattr->ia_valid & ~(ATTR_FILE)) == 0)
|
|
|
+ return 0;
|
|
|
+
|
|
|
/* Search for an existing open(O_WRITE) file */
|
|
|
if (sattr->ia_valid & ATTR_FILE) {
|
|
|
struct nfs_open_context *ctx;
|
|
@@ -2560,10 +2568,6 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- /* Deal with open(O_TRUNC) */
|
|
|
- if (sattr->ia_valid & ATTR_OPEN)
|
|
|
- sattr->ia_valid &= ~(ATTR_MTIME|ATTR_CTIME|ATTR_OPEN);
|
|
|
-
|
|
|
status = nfs4_do_setattr(inode, cred, fattr, sattr, state);
|
|
|
if (status == 0)
|
|
|
nfs_setattr_update_inode(inode, sattr);
|