From: J. Bruce Fields <bfields@xxxxxxxxxxxxxx>
I'm not sure if this is really the right fix, but it seems silly to me
that e.g.
open(O_RDWR|O_TRUNC)
write()
close()
open(O_RDONLY)
read()
results in an over-the-wire read (due to the setattr triggered by O_TRUNC).
Signed-off-by: Steve Dickson <steved@xxxxxxxxxx>
---
fs/nfs/inode.c | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 385bc6d..5cdef63 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -429,8 +429,13 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)
nfs_inode_return_delegation(inode);
error = NFS_PROTO(inode)->setattr(dentry, fattr, attr);
- if (error == 0)
+ if (error)
+ goto out_free;
+ if (attr->ia_valid & ATTR_FILE)
+ nfs_post_op_update_inode_force_wcc(inode, fattr);
+ else
nfs_refresh_inode(inode, fattr);
+out_free:
nfs_free_fattr(fattr);
out:
return error;
--
1.7.1
--
To unsubscribe from this list: send the line "unsubscribe linux-nfs" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
