3.18-stable review patch. If anyone has any objections, please let me know.
------------------ From: Jaegeuk Kim <jaeg...@kernel.org> 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 <j...@suse.cz> Reviewed-by: Chao Yu <yuch...@huawei.com> Reviewed-by: Jan Kara <j...@suse.cz> Signed-off-by: Jaegeuk Kim <jaeg...@kernel.org> Signed-off-by: Greg Kroah-Hartman <gre...@linuxfoundation.org> --- fs/f2fs/acl.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/fs/f2fs/acl.c +++ b/fs/f2fs/acl.c @@ -206,7 +206,7 @@ static int __f2fs_set_acl(struct inode * 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;