X-Git-Url: http://demsky.eecs.uci.edu/git/?a=blobdiff_plain;f=fs%2Fgfs2%2Facl.c;h=1be3b061c05c921f60ddfebcce809875fe8de662;hb=6496edfce95f943e1da43631c2f437509e56af7f;hp=7b3143064af1130d22c14f66c8236785093c545a;hpb=7ead5b7e4a3cf4a16579a8f164022345b93fe972;p=firefly-linux-kernel-4.4.55.git

diff --git a/fs/gfs2/acl.c b/fs/gfs2/acl.c
index 7b3143064af1..1be3b061c05c 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;