nfs41: change PNFS_LAYOUTRET_ON_SETATTR to only return on truncation to smaller size

[linux-2.6-block.git] / fs / nfs / nfs4proc.c

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 0b711227cfa51ffa7922711ba145d5bd53f47669..288be08bda95d5fcb8c22bd9026416ae8dc97d6d 100644 (file)
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -3211,7 +3211,9 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr,
        struct nfs4_label *label = NULL;
        int status;
 
-       if (pnfs_ld_layoutret_on_setattr(inode))
+       if (pnfs_ld_layoutret_on_setattr(inode) &&
+           sattr->ia_valid & ATTR_SIZE &&
+           sattr->ia_size < i_size_read(inode))
                pnfs_commit_and_return_layout(inode);
 
        nfs_fattr_init(fattr);