Commit f41f7418 authored by Trond Myklebust's avatar Trond Myklebust
Browse files

NFS: Ensure we zap only the access and acl caches when setting new acls 



...and ensure that we obey the NFS_INO_INVALID_ACL flag when retrieving the
acls.

Signed-off-by: default avatarTrond Myklebust <Trond.Myklebust@netapp.com>
parent 2e96d286

fs/nfs/inode.c

+1 −3
Original line number Diff line number Diff line
@@ -57,8 +57,6 @@ static int enable_ino64 = NFS_64_BIT_INODE_NUMBERS_ENABLED; 
static void nfs_invalidate_inode(struct inode *);

static int nfs_update_inode(struct inode *, struct nfs_fattr *);



static void nfs_zap_acl_cache(struct inode *);



static struct kmem_cache * nfs_inode_cachep;



static inline unsigned long
@@ -167,7 +165,7 @@ void nfs_zap_mapping(struct inode *inode, struct address_space *mapping) 
	}

}



static void nfs_zap_acl_cache(struct inode *inode)

void nfs_zap_acl_cache(struct inode *inode)

{

	void (*clear_acl_cache)(struct inode *);

fs/nfs/internal.h

+1 −0
Original line number Diff line number Diff line
@@ -150,6 +150,7 @@ extern void nfs_clear_inode(struct inode *); 
#ifdef CONFIG_NFS_V4

extern void nfs4_clear_inode(struct inode *);

#endif

void nfs_zap_acl_cache(struct inode *inode);



/* super.c */

extern struct file_system_type nfs_xdev_fs_type;

fs/nfs/nfs3acl.c

+6 −3
Original line number Diff line number Diff line
@@ -5,6 +5,8 @@ 
#include <linux/posix_acl_xattr.h>

#include <linux/nfsacl.h>



#include "internal.h"



#define NFSDBG_FACILITY	NFSDBG_PROC



ssize_t nfs3_listxattr(struct dentry *dentry, char *buffer, size_t size)
@@ -205,6 +207,8 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type) 
	status = nfs_revalidate_inode(server, inode);

	if (status < 0)

		return ERR_PTR(status);

	if (NFS_I(inode)->cache_validity & NFS_INO_INVALID_ACL)

		nfs_zap_acl_cache(inode);

	acl = nfs3_get_cached_acl(inode, type);

	if (acl != ERR_PTR(-EAGAIN))

		return acl;
@@ -319,9 +323,8 @@ static int nfs3_proc_setacls(struct inode *inode, struct posix_acl *acl, 
	dprintk("NFS call setacl\n");

	msg.rpc_proc = &server->client_acl->cl_procinfo[ACLPROC3_SETACL];

	status = rpc_call_sync(server->client_acl, &msg, 0);

	spin_lock(&inode->i_lock);

	NFS_I(inode)->cache_validity |= NFS_INO_INVALID_ACCESS;

	spin_unlock(&inode->i_lock);

	nfs_access_zap_cache(inode);

	nfs_zap_acl_cache(inode);

	dprintk("NFS reply setacl: %d\n", status);



	/* pages may have been allocated at the xdr layer. */

fs/nfs/nfs4proc.c

+4 −1
Original line number Diff line number Diff line
@@ -2695,6 +2695,8 @@ static ssize_t nfs4_proc_get_acl(struct inode *inode, void *buf, size_t buflen) 
	ret = nfs_revalidate_inode(server, inode);

	if (ret < 0)

		return ret;

	if (NFS_I(inode)->cache_validity & NFS_INO_INVALID_ACL)

		nfs_zap_acl_cache(inode);

	ret = nfs4_read_cached_acl(inode, buf, buflen);

	if (ret != -ENOENT)

		return ret;
@@ -2722,7 +2724,8 @@ static int __nfs4_proc_set_acl(struct inode *inode, const void *buf, size_t bufl 
	nfs_inode_return_delegation(inode);

	buf_to_pages(buf, buflen, arg.acl_pages, &arg.acl_pgbase);

	ret = rpc_call_sync(NFS_CLIENT(inode), &msg, 0);

	nfs_zap_caches(inode);

	nfs_access_zap_cache(inode);

	nfs_zap_acl_cache(inode);

	return ret;

}