Răsfoiți Sursa

nfs: remove unnecessary NFS_INO_INVALID_ACL checks

Unless I'm mistaken, NFS_INO_INVALID_ACL is being checked twice during
getacl calls (i.e. first via nfs_revalidate_inode() and then by each all
site).

Signed-off-by: Trond Myklebust <Trond.Myklebust@netapp.com>
James Morris 16 ani în urmă
părinte
comite
4bf259e3ae
2 a modificat fișierele cu 0 adăugiri și 4 ștergeri
  1. 0 2
      fs/nfs/nfs3acl.c
  2. 0 2
      fs/nfs/nfs4proc.c

+ 0 - 2
fs/nfs/nfs3acl.c

@@ -207,8 +207,6 @@ struct posix_acl *nfs3_proc_getacl(struct inode *inode, int type)
 	status = nfs_revalidate_inode(server, inode);
 	status = nfs_revalidate_inode(server, inode);
 	if (status < 0)
 	if (status < 0)
 		return ERR_PTR(status);
 		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);
 	acl = nfs3_get_cached_acl(inode, type);
 	if (acl != ERR_PTR(-EAGAIN))
 	if (acl != ERR_PTR(-EAGAIN))
 		return acl;
 		return acl;

+ 0 - 2
fs/nfs/nfs4proc.c

@@ -2824,8 +2824,6 @@ static ssize_t nfs4_proc_get_acl(struct inode *inode, void *buf, size_t buflen)
 	ret = nfs_revalidate_inode(server, inode);
 	ret = nfs_revalidate_inode(server, inode);
 	if (ret < 0)
 	if (ret < 0)
 		return ret;
 		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);
 	ret = nfs4_read_cached_acl(inode, buf, buflen);
 	if (ret != -ENOENT)
 	if (ret != -ENOENT)
 		return ret;
 		return ret;