diff options
| author | James Morris <jmorris@namei.org> | 2009-06-17 18:02:14 -0700 |
|---|---|---|
| committer | Trond Myklebust <Trond.Myklebust@netapp.com> | 2009-06-17 18:02:14 -0700 |
| commit | 4bf259e3ae5015e73282ba66716c4a917e1264ac (patch) | |
| tree | 4c79623911d24d86da799cee2797378a6a2a1181 /fs/nfs | |
| parent | a5a16bae707cd5d2bc97d7bd1a30079f18113a77 (diff) | |
| download | linux-3.10-4bf259e3ae5015e73282ba66716c4a917e1264ac.tar.gz linux-3.10-4bf259e3ae5015e73282ba66716c4a917e1264ac.tar.bz2 linux-3.10-4bf259e3ae5015e73282ba66716c4a917e1264ac.zip | |
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')
| -rw-r--r-- | fs/nfs/nfs3acl.c | 2 | ||||
| -rw-r--r-- | fs/nfs/nfs4proc.c | 2 |
2 files changed, 0 insertions, 4 deletions
diff --git a/fs/nfs/nfs3acl.c b/fs/nfs/nfs3acl.c index 6bbf0e6daad..bac60515a4b 100644 --- a/fs/nfs/nfs3acl.c +++ b/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); 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; diff --git a/fs/nfs/nfs4proc.c b/fs/nfs/nfs4proc.c index 55314e72163..42e6a3b0549 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) 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; |