forked from luck/tmp_suning_uos_patched
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>
This commit is contained in:
parent
cb8c20fa53
commit
88ac815cdb
fs/nfs
|
@ -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);
|
||||
|
|
|
@ -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,
|
||||
|
|
Loading…
Reference in New Issue
Block a user