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

Commit 42d96401 authored by Jaegeuk Kim's avatar Jaegeuk Kim
Browse files

f2fs: propagate error given by f2fs_find_entry 



If we get ENOMEM or EIO in f2fs_find_entry, we should stop right away.
Otherwise, for example, we can get duplicate directory entry by ->chash and
->clevel.

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

fs/f2fs/dir.c

+16 −7
Original line number Original line Diff line number Diff line
@@ -185,8 +185,13 @@ static struct f2fs_dir_entry *find_in_level(struct inode *dir, 
		/* no need to allocate new dentry pages to all the indices */

		/* no need to allocate new dentry pages to all the indices */

		dentry_page = find_data_page(dir, bidx);

		dentry_page = find_data_page(dir, bidx);

		if (IS_ERR(dentry_page)) {

		if (IS_ERR(dentry_page)) {

			if (PTR_ERR(dentry_page) == -ENOENT) {

				room = true;

				room = true;

				continue;

				continue;

			} else {

				*res_page = dentry_page;

				break;

			}

		}

		}





		de = find_in_block(dentry_page, fname, namehash, &max_slots,

		de = find_in_block(dentry_page, fname, namehash, &max_slots,
@@ -223,19 +228,22 @@ struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir, 
	struct fscrypt_name fname;

	struct fscrypt_name fname;

	int err;

	int err;





	*res_page = NULL;



	err = fscrypt_setup_filename(dir, child, 1, &fname);

	err = fscrypt_setup_filename(dir, child, 1, &fname);

	if (err)

	if (err) {

		*res_page = ERR_PTR(-ENOMEM);

		return NULL;

		return NULL;

	}





	if (f2fs_has_inline_dentry(dir)) {

	if (f2fs_has_inline_dentry(dir)) {

		*res_page = NULL;

		de = find_in_inline_dir(dir, &fname, res_page);

		de = find_in_inline_dir(dir, &fname, res_page);

		goto out;

		goto out;

	}

	}





	if (npages == 0)

	if (npages == 0) {

		*res_page = NULL;

		goto out;

		goto out;

	}





	max_depth = F2FS_I(dir)->i_current_depth;

	max_depth = F2FS_I(dir)->i_current_depth;

	if (unlikely(max_depth > MAX_DIR_HASH_DEPTH)) {

	if (unlikely(max_depth > MAX_DIR_HASH_DEPTH)) {
@@ -247,8 +255,9 @@ struct f2fs_dir_entry *f2fs_find_entry(struct inode *dir, 
	}

	}





	for (level = 0; level < max_depth; level++) {

	for (level = 0; level < max_depth; level++) {

		*res_page = NULL;

		de = find_in_level(dir, level, &fname, res_page);

		de = find_in_level(dir, level, &fname, res_page);

		if (de)

		if (de || IS_ERR(*res_page))

			break;

			break;

	}

	}

out:

out:

fs/f2fs/inline.c

+3 −1
Original line number Original line Diff line number Diff line
@@ -286,8 +286,10 @@ struct f2fs_dir_entry *find_in_inline_dir(struct inode *dir, 
	f2fs_hash_t namehash;

	f2fs_hash_t namehash;





	ipage = get_node_page(sbi, dir->i_ino);

	ipage = get_node_page(sbi, dir->i_ino);

	if (IS_ERR(ipage))

	if (IS_ERR(ipage)) {

		*res_page = ipage;

		return NULL;

		return NULL;

	}





	namehash = f2fs_dentry_hash(&name);

	namehash = f2fs_dentry_hash(&name);

fs/f2fs/namei.c

+5 −0
Original line number Original line Diff line number Diff line
@@ -232,6 +232,9 @@ static int __recover_dot_dentries(struct inode *dir, nid_t pino) 
	if (de) {

	if (de) {

		f2fs_dentry_kunmap(dir, page);

		f2fs_dentry_kunmap(dir, page);

		f2fs_put_page(page, 0);

		f2fs_put_page(page, 0);

	} else if (IS_ERR(page)) {

		err = PTR_ERR(page);

		goto out;

	} else {

	} else {

		err = __f2fs_add_link(dir, &dot, NULL, dir->i_ino, S_IFDIR);

		err = __f2fs_add_link(dir, &dot, NULL, dir->i_ino, S_IFDIR);

		if (err)

		if (err)
@@ -242,6 +245,8 @@ static int __recover_dot_dentries(struct inode *dir, nid_t pino) 
	if (de) {

	if (de) {

		f2fs_dentry_kunmap(dir, page);

		f2fs_dentry_kunmap(dir, page);

		f2fs_put_page(page, 0);

		f2fs_put_page(page, 0);

	} else if (IS_ERR(page)) {

		err = PTR_ERR(page);

	} else {

	} else {

		err = __f2fs_add_link(dir, &dotdot, NULL, pino, S_IFDIR);

		err = __f2fs_add_link(dir, &dotdot, NULL, pino, S_IFDIR);

	}

	}