Skip to contentSkip to conversation

nfs41: change PNFS_LAYOUTRET_ON_SETATTR to only return on chown/truncate

PATCH In review Peng Tao 1 participant 2 messages Sep 12, 2014

Subsystems (2)
lore
Share & tools
lore

Peng Tao

author
#0 lore raw

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]>
---
 fs/nfs/nfs4proc.c | 3 ++-
 fs/nfs/pnfs.h     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +2 -1
index 7dd8aca..e55bd0f 100644
@@ -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
index aca3dff..1765ea8 100644
@@ -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
author
#1 lore raw

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_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]>
---
 fs/nfs/nfs4proc.c | 3 ++-
 fs/nfs/pnfs.h     | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)
fs/nfs/nfs4proc.c +2 -1
index 7dd8aca..e55bd0f 100644
@@ -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
index aca3dff..1765ea8 100644
@@ -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