Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 4814f56d authored by Andreas Gruenbacher's avatar Andreas Gruenbacher Committed by Trond Myklebust
Browse files

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: default avatarAndreas Gruenbacher <agruen@suse.de>
Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 1842bfb4

fs/nfs/nfs3acl.c

+8 −3
Original line number Diff line number Diff line
@@ -172,7 +172,9 @@ static void nfs3_cache_acls(struct inode *inode, struct posix_acl *acl, 
		inode->i_ino, acl, dfacl);

	spin_lock(&inode->i_lock);

	__nfs3_forget_cached_acls(NFS_I(inode));

	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);

}
@@ -254,7 +256,9 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type) 
			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:
@@ -329,6 +333,7 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, 
	switch (status) {

		case 0:

			status = nfs_refresh_inode(inode, &fattr);

			nfs3_cache_acls(inode, acl, dfacl);

			break;

		case -EPFNOSUPPORT:

		case -EPROTONOSUPPORT: