Skip to content

L
linux-davinci
Commit 642ac549 authored by Trond Myklebust's avatar Trond Myklebust
Browse files
Options

NFSv4: Return delegations in case we're changing ACLs 

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent cae7a073
Hide whitespace changes
Inline Side-by-side
Showing with 6 additions and 0 deletions
fs/nfs/inode.c
View file @ 642ac549
...@@ -853,6 +853,11 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr) ...@@ -853,6 +853,11 @@ nfs_setattr(struct dentry *dentry, struct iattr *attr)
filemap_fdatawait(inode->i_mapping); filemap_fdatawait(inode->i_mapping);
nfs_wb_all(inode); nfs_wb_all(inode);
} }
/*
* Return any delegations if we're going to change ACLs
*/
if ((attr->ia_valid & (ATTR_MODE|ATTR_UID|ATTR_GID)) != 0)
nfs_inode_return_delegation(inode);
error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr); error = NFS_PROTO(inode)->setattr(dentry, &fattr, attr);
if (error == 0) if (error == 0)
nfs_refresh_inode(inode, &fattr); nfs_refresh_inode(inode, &fattr);
......
fs/nfs/nfs4proc.c
View file @ 642ac549
...@@ -2405,6 +2405,7 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen ...@@ -2405,6 +2405,7 @@ static int nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t buflen
if (!nfs4_server_supports_acls(server)) if (!nfs4_server_supports_acls(server))
return -EOPNOTSUPP; return -EOPNOTSUPP;
nfs_inode_return_delegation(inode);
buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase); buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);
ret = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0); ret = rpc_call_sync(NFS_SERVER(inode)->client, &msg, 0);
if (ret == 0) if (ret == 0)
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment