2014-09-11 15:02:45

by Peng Tao

Subject: [PATCH] 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(-)

diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c
index 7dd8aca..e55bd0f 100644
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@ -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);
diff --git a/fs/nfs/pnfs.h b/fs/nfs/pnfs.h
index aca3dff..1765ea8 100644
--- a/fs/nfs/pnfs.h
+++ b/fs/nfs/pnfs.h
@@ -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

2014-09-12 02:24:13

by Peng Tao

Subject: Re: [PATCH] nfs41: change PNFS_LAYOUTRET_ON_SETATTR to only return on chown/truncate

On Fri, Sep 12, 2014 at 4:11 AM, Christoph Hellwig <[email protected]> wrote:
> On Thu, Sep 11, 2014 at 11:02:32PM +0800, Peng Tao wrote:
>> 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.
>
> We should defintively reduce the amount of returns, but why do we even
> bother and chown and a truncate to a larger size?
hmm, I agree. Let's only layoutreturn on truncate to a smaller size
and let server decide if it needs CB_LAYOUTRECALL in chown.

2014-09-11 20:11:49

by Christoph Hellwig

Subject: Re: [PATCH] nfs41: change PNFS_LAYOUTRET_ON_SETATTR to only return on chown/truncate

On Thu, Sep 11, 2014 at 11:02:32PM +0800, Peng Tao wrote:
> 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.

We should defintively reduce the amount of returns, but why do we even
bother and chown and a truncate to a larger size?