diff options
author | James Morris <jmorris@namei.org> | 2009-06-17 21:02:14 -0400 |
---|---|---|
committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 21:02:14 -0400 |
commit | 4bf259e3ae5015e73282ba66716c4a917e1264ac (patch) | |
tree | 4c79623911d24d86da799cee2797378a6a2a1181 /fs/nfs/nfs4proc.c | |
parent | a5a16bae707cd5d2bc97d7bd1a30079f18113a77 (diff) |
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>
Diffstat (limited to 'fs/nfs/nfs4proc.c')
-rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 55314e721632..42e6a3b05498 100644 --- a/fs/nfs/nfs4proc.c +++ b/fs/nfs/nfs4proc.c | |||
@@ -2824,8 +2824,6 @@ static ssize_t nfs4_proc_get_acl(struct inode *inode, void *buf, size_t buflen) | |||
2824 | ret = nfs_revalidate_inode(server, inode); | 2824 | ret = nfs_revalidate_inode(server, inode); |
2825 | if (ret < 0) | 2825 | if (ret < 0) |
2826 | return ret; | 2826 | return ret; |
2827 | if (NFS_I(inode)->cache_validity & NFS_INO_INVALID_ACL) | ||
2828 | nfs_zap_acl_cache(inode); | ||
2829 | ret = nfs4_read_cached_acl(inode, buf, buflen); | 2827 | ret = nfs4_read_cached_acl(inode, buf, buflen); |
2830 | if (ret != -ENOENT) | 2828 | if (ret != -ENOENT) |
2831 | return ret; | 2829 | return ret; |