提交 4814f56d 编写于 作者: A Andreas Gruenbacher 提交者: Trond Myklebust

NFSv3: Client-side nfsacl caching fix

Fix two errors in the client-side acl cache: First, when nfs3_proc_getacl
requests only the default acl of a file and the access acl is not cached
already, a NULL access acl entry is cached instead of ERR_PTR(-EAGAIN)
("not cached").

Second, update the cached acls in nfs3_proc_setacls: nfs_refresh_inode does
not always invalidate the cached acls, and when it does not, the cached acls
get out of sync.
Signed-off-by: NAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: NTrond Myklebust <Trond.Myklebust@netapp.com>
上级 1842bfb4
...@@ -172,8 +172,10 @@ static void nfs3_cache_acls(struct inode *inode, struct posix_acl *acl, ...@@ -172,8 +172,10 @@ static void nfs3_cache_acls(struct inode *inode, struct posix_acl *acl,
inode->i_ino, acl, dfacl); inode->i_ino, acl, dfacl);
spin_lock(&inode->i_lock); spin_lock(&inode->i_lock);
__nfs3_forget_cached_acls(NFS_I(inode)); __nfs3_forget_cached_acls(NFS_I(inode));
nfsi->acl_access = posix_acl_dup(acl); if (!IS_ERR(acl))
nfsi->acl_default = posix_acl_dup(dfacl); nfsi->acl_access = posix_acl_dup(acl);
if (!IS_ERR(dfacl))
nfsi->acl_default = posix_acl_dup(dfacl);
spin_unlock(&inode->i_lock); spin_unlock(&inode->i_lock);
} }
...@@ -254,7 +256,9 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type) ...@@ -254,7 +256,9 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)
res.acl_access = NULL; res.acl_access = NULL;
} }
} }
nfs3_cache_acls(inode, res.acl_access, res.acl_default); nfs3_cache_acls(inode,
(res.mask & NFS_ACL) ? res.acl_access : ERR_PTR(-EINVAL),
(res.mask & NFS_DFACL) ? res.acl_default : ERR_PTR(-EINVAL));
switch(type) { switch(type) {
case ACL_TYPE_ACCESS: case ACL_TYPE_ACCESS:
...@@ -329,6 +333,7 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, ...@@ -329,6 +333,7 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl,
switch (status) { switch (status) {
case 0: case 0:
status = nfs_refresh_inode(inode, &fattr); status = nfs_refresh_inode(inode, &fattr);
nfs3_cache_acls(inode, acl, dfacl);
break; break;
case -EPFNOSUPPORT: case -EPFNOSUPPORT:
case -EPROTONOSUPPORT: case -EPROTONOSUPPORT:
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册