summaryrefslogtreecommitdiffstats
path: root/fs/gfs2/acl.c
diff options
context:
space:
mode:
authorAndreas Gruenbacher <agruenba@redhat.com>2015-02-13 12:16:37 -0600
committerBob Peterson <rpeterso@redhat.com>2015-03-18 12:41:57 -0500
commit932e468a377f62569fe3818f160fadbaef3f26bd (patch)
tree8bbd65f30c4852a8a08547a23bfda51efb5c8631 /fs/gfs2/acl.c
parent28666d6dc3feca2b1983e6011df383299d8b6b64 (diff)
downloadop-kernel-dev-932e468a377f62569fe3818f160fadbaef3f26bd.zip
op-kernel-dev-932e468a377f62569fe3818f160fadbaef3f26bd.tar.gz
GFS2: gfs2_set_acl(): Cache "no acl" as well
When removing a default acl or setting an access acl that is entirely represented in the file mode, we end up with acl == NULL in gfs2_set_acl(). In that case, bring gfs2 in line with other file systems and cache the NULL acl with set_cached_acl() instead of invalidating the cache with forget_cached_acl(). Signed-off-by: Andreas Gruenbacher <agruenba@redhat.com> Signed-off-by: Bob Peterson <rpeterso@redhat.com>
Diffstat (limited to 'fs/gfs2/acl.c')
-rw-r--r--fs/gfs2/acl.c6
1 files changed, 1 insertions, 5 deletions
diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 7b31430..1be3b06 100644
--- a/fs/gfs2/acl.c
+++ b/fs/gfs2/acl.c
@@ -110,11 +110,7 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
error = __gfs2_xattr_set(inode, name, data, len, 0, GFS2_EATYPE_SYS);
if (error)
goto out;
-
- if (acl)
- set_cached_acl(inode, type, acl);
- else
- forget_cached_acl(inode, type);
+ set_cached_acl(inode, type, acl);
out:
kfree(data);
return error;
OpenPOWER on IntegriCloud