f2fs: handle errors correctly during f2fs_reserve_block

[GitHub/exynos8895/android_kernel_samsung_universal8895.git] / fs / f2fs / dir.c

diff --git a/fs/f2fs/dir.c b/fs/f2fs/dir.c
index 6da77e5c753b353416a2e73e15cd879645b56744..f815ca0c5819f51107fb41da6123f61331b69754 100644 (file)
--- a/fs/f2fs/dir.c
+++ b/fs/f2fs/dir.c
@@ -342,11 +342,11 @@ static struct page *init_inode_metadata(struct inode *inode,
 
                err = f2fs_init_acl(inode, dir, page);
                if (err)
-                       goto error;
+                       goto put_error;
 
                err = f2fs_init_security(inode, dir, name, page);
                if (err)
-                       goto error;
+                       goto put_error;
 
                wait_on_page_writeback(page);
        } else {
@@ -370,8 +370,9 @@ static struct page *init_inode_metadata(struct inode *inode,
        }
        return page;
 
-error:
+put_error:
        f2fs_put_page(page, 1);
+error:
        remove_inode_page(inode);
        return ERR_PTR(err);
 }