aboutsummaryrefslogtreecommitdiff
path: root/fs
diff options
context:
space:
mode:
authorJaegeuk Kim <jaegeuk@kernel.org>2017-07-11 14:56:49 -0700
committerMoyster <oysterized@gmail.com>2017-07-21 12:38:26 +0200
commitbf3daba908853f9302858d263dc4df63b0da28a3 (patch)
tree24e076c4c249cb2e9318f6ed3a4594d5a934a3bd /fs
parent14a14969f0b76cb676359137551259f322c508f4 (diff)
f2fs: Don't clear SGID when inheriting ACLs
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> Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Diffstat (limited to 'fs')
-rw-r--r--fs/f2fs/acl.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index 800797c41..46719f135 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -228,7 +228,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;