Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 548aedac authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: handle error cases in move_encrypted_block 



This patch fixes some missing error handlers.

Reviewed-by: default avatarChao Yu <chao2.yu@samsung.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 33b40178

fs/f2fs/gc.c

+15 −8
Original line number Diff line number Diff line
@@ -556,27 +556,34 @@ static void move_encrypted_block(struct inode *inode, block_t bidx) 
	if (!fio.encrypted_page)

		goto put_out;



	f2fs_submit_page_bio(&fio);

	err = f2fs_submit_page_bio(&fio);

	if (err)

		goto put_page_out;



	/* write page */

	lock_page(fio.encrypted_page);



	if (unlikely(!PageUptodate(fio.encrypted_page)))

		goto put_page_out;

	if (unlikely(fio.encrypted_page->mapping != META_MAPPING(fio.sbi)))

		goto put_page_out;



	set_page_writeback(fio.encrypted_page);



	/* allocate block address */

	f2fs_wait_on_page_writeback(dn.node_page, NODE);



	allocate_data_block(fio.sbi, NULL, fio.blk_addr,

					&fio.blk_addr, &sum, CURSEG_COLD_DATA);

	dn.data_blkaddr = fio.blk_addr;



	/* write page */

	lock_page(fio.encrypted_page);

	set_page_writeback(fio.encrypted_page);

	fio.rw = WRITE_SYNC;

	f2fs_submit_page_mbio(&fio);



	dn.data_blkaddr = fio.blk_addr;

	set_data_blkaddr(&dn);

	f2fs_update_extent_cache(&dn);

	set_inode_flag(F2FS_I(inode), FI_APPEND_WRITE);

	if (page->index == 0)

		set_inode_flag(F2FS_I(inode), FI_FIRST_BLOCK_WRITTEN);



put_page_out:

	f2fs_put_page(fio.encrypted_page, 1);

put_out:

	f2fs_put_dnode(&dn);