[PATCH AUTOSEL 4.20 089/304] f2fs: fix wrong return value of f2fs_acl_create

[Sasha Levin]

From: Tiezhu Yang <kernelpa...@126.com>

[ Upstream commit f6176473a0c7472380eef72ebeb330cf9485bf0a ]

When call f2fs_acl_create_masq() failed, the caller f2fs_acl_create()
should return -EIO instead of -ENOMEM, this patch makes it consistent
with posix_acl_create() which has been fixed in commit beaf226b863a
("posix_acl: don't ignore return value of posix_acl_create_masq()").

Fixes: 83dfe53c185e ("f2fs: fix reference leaks in f2fs_acl_create")
Signed-off-by: Tiezhu Yang <kernelpa...@126.com>
Reviewed-by: Chao Yu <yuch...@huawei.com>
Signed-off-by: Jaegeuk Kim <jaeg...@kernel.org>
Signed-off-by: Sasha Levin <sas...@kernel.org>
---
 fs/f2fs/acl.c | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/fs/f2fs/acl.c b/fs/f2fs/acl.c
index fa707cdd4120..22f0d17cde43 100644
--- a/fs/f2fs/acl.c
+++ b/fs/f2fs/acl.c
@@ -352,12 +352,14 @@ static int f2fs_acl_create(struct inode *dir, umode_t 
*mode,
                return PTR_ERR(p);
 
        clone = f2fs_acl_clone(p, GFP_NOFS);
-       if (!clone)
-               goto no_mem;
+       if (!clone) {
+               ret = -ENOMEM;
+               goto release_acl;
+       }
 
        ret = f2fs_acl_create_masq(clone, mode);
        if (ret < 0)
-               goto no_mem_clone;
+               goto release_clone;
 
        if (ret == 0)
                posix_acl_release(clone);
@@ -371,11 +373,11 @@ static int f2fs_acl_create(struct inode *dir, umode_t 
*mode,
 
        return 0;
 
-no_mem_clone:
+release_clone:
        posix_acl_release(clone);
-no_mem:
+release_acl:
        posix_acl_release(p);
-       return -ENOMEM;
+       return ret;
 }
 
 int f2fs_init_acl(struct inode *inode, struct inode *dir, struct page *ipage,
-- 
2.19.1