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

Both blocks layout and objects layout want to use it to avoid CB_LAYOUTRECALL
but that should only happen if client is doing truncation to a smaller size.
For other cases, we let server decide if it wants to recall client's layouts.
Change PNFS_LAYOUTRET_ON_SETATTR to follow the logic and not to send
layoutreturn unnecessarily.

Cc: Christoph Hellwig <hch@lst.de>
Cc: Boaz Harrosh <boaz@plexistor.com>
Signed-off-by: Peng Tao <tao.peng@primarydata.com>
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>

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);

diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index b10f12fc68180e1e54db46f38e9cf2f3f1556033..693ce42ec6831eefa2baa72f8af1a95d3c846172 100644 (file)
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -69,7 +69,8 @@ enum {
 };
 
 enum layoutdriver_policy_flags {
-       /* Should the pNFS client commit and return the layout upon a setattr */
+       /* Should the pNFS client commit and return the layout upon truncate to
+        * a smaller size */
        PNFS_LAYOUTRET_ON_SETATTR       = 1 << 0,
        PNFS_LAYOUTRET_ON_ERROR         = 1 << 1,
        PNFS_READ_WHOLE_PAGE            = 1 << 2,