From: Chengguang Xu <cgxu519@gmx.com>
Date: Mon, 10 Dec 2018 05:22:38 +0000 (-0500)
Subject: ext4: compare old and new mode before setting update_mode flag
X-Git-Tag: v5.0-rc1~120^2~4
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=0a1e8258a4fecd5aad2815b43bbe0ff014de1d8a;p=thirdparty%2Fkernel%2Flinux.git

ext4: compare old and new mode before setting update_mode flag

If new mode is the same as old mode we don't have to reset
inode mode in the rest of the code, so compare old and new
mode before setting update_mode flag.

Signed-off-by: Chengguang Xu <cgxu519@gmx.com>
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
---

diff --git a/fs/ext4/acl.c b/fs/ext4/acl.c
index c1d570ee1d9f4..8c7bbf3e566de 100644
--- a/fs/ext4/acl.c
+++ b/fs/ext4/acl.c
@@ -248,7 +248,8 @@ retry:
 		error = posix_acl_update_mode(inode, &mode, &acl);
 		if (error)
 			goto out_stop;
-		update_mode = 1;
+		if (mode != inode->i_mode)
+			update_mode = 1;
 	}
 
 	error = __ext4_set_acl(handle, inode, type, acl, 0 /* xattr_flags */);