diff options
-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 6bbf0e6daad2..bac60515a4b3 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) | |||
207 | status = nfs_revalidate_inode(server, inode); | 207 | status = nfs_revalidate_inode(server, inode); |
208 | if (status < 0) | 208 | if (status < 0) |
209 | return ERR_PTR(status); | 209 | return ERR_PTR(status); |
210 | if (NFS_I(inode)->cache_validity & NFS_INO_INVALID_ACL) | ||
211 | nfs_zap_acl_cache(inode); | ||
212 | acl = nfs3_get_cached_acl(inode, type); | 210 | acl = nfs3_get_cached_acl(inode, type); |
213 | if (acl != ERR_PTR(-EAGAIN)) | 211 | if (acl != ERR_PTR(-EAGAIN)) |
214 | return acl; | 212 | return acl; |
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; |