Client-side nfsacl caching fix
PATCH 1/1 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 Andreas Gruenbacher <[email protected]>
fs/nfs/nfs3acl.c +8 -3
@@ -172,8 +172,10 @@ static void nfs3_cache_acls(struct inode inode->i_ino, acl, dfacl);spin_lock (&inode->i_lock);__nfs3_forget_cached_acls (NFS_I (inode)); - nfsi->acl_access =posix_acl_dup (acl); - nfsi->acl_default =posix_acl_dup (dfacl); +if (!IS_ERR (acl)) + nfsi->acl_access =posix_acl_dup (acl); +if (!IS_ERR (dfacl)) + nfsi->acl_default =posix_acl_dup (dfacl);spin_unlock (&inode->i_lock); }
@@ -250,7 +252,9 @@ struct posix_acl *nfs3_proc_getacl(struc 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) {case ACL_TYPE_ACCESS :
@@ -321,6 +325,7 @@ static int nfs3_proc_setacls(struct inodswitch (status) {case 0 : status =nfs_refresh_inode (inode, &fattr); +nfs3_cache_acls (inode, acl, dfacl);break ;case -EPFNOSUPPORT :case -EPROTONOSUPPORT :