nfs41: change PNFS_LAYOUTRET_ON_SETATTR to only return on chown/truncate
Subsystems (2)
PATCH 1/1 nfs41: change PNFS_LAYOUTRET_ON_SETATTR to only return on chown/truncate
Both blocks layout and objects layout want to use it to avoid CB_LAYOUTRECALL but that should only happen if client is doing chown or truncate. So change PNFS_LAYOUTRET_ON_SETATTR to follow the logic and not to send layoutreturn unnecessarily.
Cc Christoph Hellwig <[email protected]>
Cc Boaz Harrosh <[email protected]>
Signed-off-by Peng Tao <[email protected]>
--- fs/nfs/nfs4proc.c | 3 ++- fs/nfs/pnfs.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +2 -1
@@ -3213,7 +3213,8 @@ 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_UID |ATTR_GID |ATTR_SIZE ))pnfs_commit_and_return_layout (inode);nfs_fattr_init (fattr);
fs/nfs/pnfs.h +2 -1
@@ -68,7 +68,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 a setattr +* that changes uid/gid/size. */ PNFS_LAYOUTRET_ON_SETATTR =1 <<0 ,PNFS_LAYOUTRET_ON_ERROR =1 <<1 , };
Signature · 1 line
1.9.1
sorry, sent out wrong patch. Please ignore this.
Quoted 44 lines · Peng Tao
Both blocks layout and objects layout want to use it to avoid
CB_LAYOUTRECALLbut that should only happen if client is doing chown or truncate. So changePNFS_LAYOUTRET_ON_SETATTRto follow the logic and not to send layoutreturn unnecessarily.Cc Christoph Hellwig <[email protected]>Cc Boaz Harrosh <[email protected]>Signed-off-by Peng Tao <[email protected]>--- fs/nfs/nfs4proc.c | 3 ++- fs/nfs/pnfs.h | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-)fs/nfs/nfs4proc.c +2
-1@@ -3213,7 +3213,8 @@ 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_UID |ATTR_GID |ATTR_SIZE ))pnfs_commit_and_return_layout (inode);nfs_fattr_init (fattr);fs/nfs/pnfs.h +2
-2@@ -68,7 +68,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 a setattr +* that changes uid/gid/size. */ PNFS_LAYOUTRET_ON_SETATTR =1 <<0 ,PNFS_LAYOUTRET_ON_ERROR =1 <<1 , }; --1.9.1