diff options
| author |   Trond Myklebust <trond.myklebust@primarydata.com> | 2018-03-20 16:43:18 -0400 |
|---|---|---|
| committer |   Anna Schumaker <Anna.Schumaker@Netapp.com> | 2018-04-10 16:06:22 -0400 |
| commit | 199366f0173f9e01efc23ecd7d88b82ad34f42fb (patch) | |
| tree | 3061a0b88f4ab26b56e1771512b9e460b237a6fe /fs/nfs | |
| parent | NFS: Add a delegation return into nfs4_proc_unlink_setup() (diff) | |
| download | linux-dev-199366f0173f9e01efc23ecd7d88b82ad34f42fb.tar.xz linux-dev-199366f0173f9e01efc23ecd7d88b82ad34f42fb.zip | |
NFS: Move the delegation return down into _nfs4_do_setattr()
Signed-off-by: Trond Myklebust <trond.myklebust@primarydata.com>
Signed-off-by: Anna Schumaker <Anna.Schumaker@Netapp.com>
Diffstat (limited to 'fs/nfs')
| -rw-r--r-- | fs/nfs/inode.c | 5 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c index 7d893543cf3b..9da00b2e26a1 100644 --- a/fs/nfs/inode.c +++ b/fs/nfs/inode.c @@ -613,11 +613,6 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) goto out; } - /* - * Return any delegations if we're going to change ACLs - */ - if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) - NFS_PROTO(inode)->return_delegation(inode); error = NFS_PROTO(inode)->setattr(dentry, fattr, attr); if (error == 0) error = nfs_refresh_inode(inode, fattr); diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 21daeac114fe..173089f5bf7e 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c @@ -3875,6 +3875,10 @@ nfs4_proc_setattr(struct dentry *dentry, struct nfs_fattr *fattr, if (IS_ERR(label)) return PTR_ERR(label); + /* Return any delegations if we're going to change ACLs */ + if ((sattr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0) + nfs4_inode_return_delegation(inode); + status = nfs4_do_setattr(inode, cred, fattr, sattr, ctx, NULL, label); if (status == 0) { nfs_setattr_update_inode(inode, sattr, fattr); |