From: Chao Yu <yuchao0@huawei.com>
Date: Tue, 3 Sep 2019 02:06:25 +0000 (+0800)
Subject: f2fs: fix error path of f2fs_convert_inline_page()
X-Git-Tag: v4.19.99~89
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=6b33b0ea44cad563195c69e16433eb196bdb9928;p=thirdparty%2Fkernel%2Fstable.git

f2fs: fix error path of f2fs_convert_inline_page()

[ Upstream commit e8c82c11c93d586d03d80305959527bcac383555 ]

In error path of f2fs_convert_inline_page(), we missed to truncate newly
reserved block in .i_addrs[0] once we failed in get_node_info(), fix it.

Fixes: 7735730d39d7 ("f2fs: fix to propagate error from __get_meta_page()")
Signed-off-by: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/fs/f2fs/inline.c b/fs/f2fs/inline.c
index 6bbb5f6801e26..3fe0dd5313903 100644
--- a/fs/f2fs/inline.c
+++ b/fs/f2fs/inline.c
@@ -133,6 +133,7 @@ int f2fs_convert_inline_page(struct dnode_of_data *dn, struct page *page)
 
 	err = f2fs_get_node_info(fio.sbi, dn->nid, &ni);
 	if (err) {
+		f2fs_truncate_data_blocks_range(dn, 1);
 		f2fs_put_dnode(dn);
 		return err;
 	}