X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;ds=sidebyside;f=kernel%2Ffs%2Fgfs2%2Facl.c;fp=kernel%2Ffs%2Fgfs2%2Facl.c;h=ff0ac96a8e7bd6eea557541e47ec90a9eb8555ff;hb=52f993b8e89487ec9ee15a7fb4979e0f09a45b27;hp=1be3b061c05c921f60ddfebcce809875fe8de662;hpb=c189ccac5702322ed843fe17057035b7222a59b6;p=kvmfornfv.git

diff --git a/kernel/fs/gfs2/acl.c b/kernel/fs/gfs2/acl.c
index 1be3b061c..ff0ac96a8 100644
--- a/kernel/fs/gfs2/acl.c
+++ b/kernel/fs/gfs2/acl.c
@@ -79,17 +79,11 @@ int gfs2_set_acl(struct inode *inode, struct posix_acl *acl, int type)
 	if (type == ACL_TYPE_ACCESS) {
 		umode_t mode = inode->i_mode;
 
-		error = posix_acl_equiv_mode(acl, &mode);
-		if (error < 0)
+		error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
+		if (error)
 			return error;
-
-		if (error == 0)
-			acl = NULL;
-
-		if (mode != inode->i_mode) {
-			inode->i_mode = mode;
+		if (mode != inode->i_mode)
 			mark_inode_dirty(inode);
-		}
 	}
 
 	if (acl) {