]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
f2fs: Don't clear SGID when inheriting ACLs
authorJaegeuk Kim <jaegeuk@kernel.org>
Tue, 11 Jul 2017 21:56:49 +0000 (14:56 -0700)
committerJaegeuk Kim <jaegeuk@kernel.org>
Sun, 16 Jul 2017 04:10:23 +0000 (21:10 -0700)
This patch copies commit b7f8a09f80:
"btrfs: Don't clear SGID when inheriting ACLs" written by Jan.

Fixes: 073931017b49d9458aa351605b43a7e34598caef
CC: stable@vger.kernel.org
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>
fs/f2fs/acl.c

index a140c5e3dc54ebf89853e57fb80bbce0c5590478..b4b8438c42ef9cbbe9805fbc233a5a9cde216ada 100644 (file)
@@ -211,7 +211,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;