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

Commit 5905f9af authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: handle error in recover_orphan_inode 



This patch enhances the error path in recover_orphan_inode.

Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 49ed09dd

fs/f2fs/checkpoint.c

+18 −1
Original line number Diff line number Diff line
@@ -531,8 +531,9 @@ void remove_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) 
static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino)

{

	struct inode *inode;

	struct node_info ni;



	inode = f2fs_iget(sbi->sb, ino);

	inode = f2fs_iget_retry(sbi->sb, ino);

	if (IS_ERR(inode)) {

		/*

		 * there should be a bug that we can't find the entry
@@ -546,6 +547,22 @@ static int recover_orphan_inode(struct f2fs_sb_info *sbi, nid_t ino) 


	/* truncate all the data during iput */

	iput(inode);



	get_node_info(sbi, ino, &ni);



	/* ENOMEM was fully retried in f2fs_evict_inode. */

	if (ni.blk_addr != NULL_ADDR) {

		int err = acquire_orphan_inode(sbi);



		if (err) {

			set_sbi_flag(sbi, SBI_NEED_FSCK);

			f2fs_msg(sbi->sb, KERN_WARNING,

				"%s: orphan failed (ino=%x), run fsck to fix.",

					__func__, ino);

			return err;

		}

		__add_ino_entry(sbi, ino, ORPHAN_INO);

	}

	return 0;

}