commit 458818ed76d3f495f9f32373c936456c9427f759
author Trond Myklebust <Trond.Myklebust@netapp.com> Wed Jun 22 17:16:27 2005 +0000
committer Trond Myklebust <Trond.Myklebust@netapp.com> Wed Jun 22 16:07:26 2005 -0400
tree cf280ec14954d61fea2f171eaa198196fe5a1e56
parent 5c6a9f7d92291c832d47e792ed1fafa44acb066e

[PATCH] NFS: Fix up v3 ACL caching code

 Initialize the inode cache values correctly.
 Clean up __nfs3_forget_cached_acls()

 Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>

fs/nfs/inode.c

diff --git a/fs/nfs/inode.c b/fs/nfs/inode.c
index 50a03f1..8a8d57d 100644
--- a/fs/nfs/inode.c
+++ b/fs/nfs/inode.c
@@ -1961,6 +1961,10 @@
 	if (!nfsi)
 		return NULL;
 	nfsi->flags = 0;
+#ifdef CONFIG_NFS_V3_ACL
+	nfsi->acl_access = ERR_PTR(-EAGAIN);
+	nfsi->acl_default = ERR_PTR(-EAGAIN);
+#endif
 #ifdef CONFIG_NFS_V4
 	nfsi->nfs4_acl = NULL;
 #endif /* CONFIG_NFS_V4 */

fs/nfs/nfs3acl.c

diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c
index 451112f..ee3536f 100644
--- a/fs/nfs/nfs3acl.c
+++ b/fs/nfs/nfs3acl.c
@@ -115,11 +115,11 @@
 
 static void __nfs3_forget_cached_acls(struct nfs_inode *nfsi)
 {
-	if (nfsi->acl_access != ERR_PTR(-EAGAIN)) {
+	if (!IS_ERR(nfsi->acl_access)) {
 		posix_acl_release(nfsi->acl_access);
 		nfsi->acl_access = ERR_PTR(-EAGAIN);
 	}
-	if (nfsi->acl_default != ERR_PTR(-EAGAIN)) {
+	if (!IS_ERR(nfsi->acl_default)) {
 		posix_acl_release(nfsi->acl_default);
 		nfsi->acl_default = ERR_PTR(-EAGAIN);
 	}
@@ -137,7 +137,7 @@
 static struct posix_acl *nfs3_get_cached_acl(struct inode *inode, int type)
 {
 	struct nfs_inode *nfsi = NFS_I(inode);
-	struct posix_acl *acl = ERR_PTR(-EAGAIN);
+	struct posix_acl *acl = ERR_PTR(-EINVAL);
 
 	spin_lock(&inode->i_lock);
 	switch(type) {
@@ -150,12 +150,13 @@
 			break;
 
 		default:
-			return ERR_PTR(-EINVAL);
+			goto out;
 	}
-	if (acl == ERR_PTR(-EAGAIN))
+	if (IS_ERR(acl))
 		acl = ERR_PTR(-EAGAIN);
 	else
 		acl = posix_acl_dup(acl);
+out:
 	spin_unlock(&inode->i_lock);
 	dprintk("NFS: nfs3_get_cached_acl(%s/%ld, %d) = %p\n", inode->i_sb->s_id,
 		inode->i_ino, type, acl);