From: Jaegeuk Kim <jaegeuk@kernel.org>
Date: Tue, 11 Jul 2017 21:56:49 +0000 (-0700)
Subject: f2fs: Don't clear SGID when inheriting ACLs
X-Git-Tag: v4.4.79~34
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=fca8859982fb0e591c9baa10f1ba7c405dd5a120;p=thirdparty%2Fkernel%2Fstable.git

f2fs: Don't clear SGID when inheriting ACLs

commit c925dc162f770578ff4a65ec9b08270382dba9e6 upstream.

This patch copies commit b7f8a09f80:
"btrfs: Don't clear SGID when inheriting ACLs" written by Jan.

Fixes: 073931017b49d9458aa351605b43a7e34598caef
Signed-off-by: Jan Kara <jack@suse.cz>
Reviewed-by: Chao Yu <yuchao0@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
---

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index e9a8d676c6bc5..83dcf7bfd7b8f 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -213,7 +213,7 @@ static int __f2fs_set_acl(struct inode *inode, int type,
 	switch (type) {
 	case ACL_TYPE_ACCESS:
 		name_index = F2FS_XATTR_INDEX_POSIX_ACL_ACCESS;
-		if (acl) {
+		if (acl && !ipage) {
 			error = posix_acl_update_mode(inode, &inode->i_mode, &acl);
 			if (error)
 				return error;