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

Commit 91246c21 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: fix to report error number of f2fs_find_entry 



This patch fixes to report the right error number of f2fs_find_entry to
its caller.

Signed-off-by: default avatarChao Yu <yuchao0@huawei.com>
Signed-off-by: default avatarJaegeuk Kim <jaegeuk@kernel.org>
parent 363cad7f

fs/f2fs/dir.c

+5 −5
Original line number Original line Diff line number Diff line
@@ -272,17 +272,17 @@ struct f2fs_dir_entry *f2fs_parent_dir(struct inode *dir, struct page **p) 
	return f2fs_find_entry(dir, &dotdot, p);

	return f2fs_find_entry(dir, &dotdot, p);

}

}





ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr)

ino_t f2fs_inode_by_name(struct inode *dir, struct qstr *qstr,

							struct page **page)

{

{

	ino_t res = 0;

	ino_t res = 0;

	struct f2fs_dir_entry *de;

	struct f2fs_dir_entry *de;

	struct page *page;





	de = f2fs_find_entry(dir, qstr, &page);

	de = f2fs_find_entry(dir, qstr, page);

	if (de) {

	if (de) {

		res = le32_to_cpu(de->ino);

		res = le32_to_cpu(de->ino);

		f2fs_dentry_kunmap(dir, page);

		f2fs_dentry_kunmap(dir, *page);

		f2fs_put_page(page, 0);

		f2fs_put_page(*page, 0);

	}

	}





	return res;

	return res;

fs/f2fs/f2fs.h

+1 −1
Original line number Original line Diff line number Diff line
@@ -1898,7 +1898,7 @@ void f2fs_drop_nlink(struct inode *, struct inode *); 
struct f2fs_dir_entry *f2fs_find_entry(struct inode *, struct qstr *,

struct f2fs_dir_entry *f2fs_find_entry(struct inode *, struct qstr *,

							struct page **);

							struct page **);

struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **);

struct f2fs_dir_entry *f2fs_parent_dir(struct inode *, struct page **);

ino_t f2fs_inode_by_name(struct inode *, struct qstr *);

ino_t f2fs_inode_by_name(struct inode *, struct qstr *, struct page **);

void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,

void f2fs_set_link(struct inode *, struct f2fs_dir_entry *,

				struct page *, struct inode *);

				struct page *, struct inode *);

int update_dent_inode(struct inode *, struct inode *, const struct qstr *);

int update_dent_inode(struct inode *, struct inode *, const struct qstr *);

fs/f2fs/namei.c

+35 −11
Original line number Original line Diff line number Diff line
@@ -202,9 +202,13 @@ static int f2fs_link(struct dentry *old_dentry, struct inode *dir, 
struct dentry *f2fs_get_parent(struct dentry *child)

struct dentry *f2fs_get_parent(struct dentry *child)

{

{

	struct qstr dotdot = QSTR_INIT("..", 2);

	struct qstr dotdot = QSTR_INIT("..", 2);

	unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot);

	struct page *page;

	if (!ino)

	unsigned long ino = f2fs_inode_by_name(d_inode(child), &dotdot, &page);

	if (!ino) {

		if (IS_ERR(page))

			return ERR_CAST(page);

		return ERR_PTR(-ENOENT);

		return ERR_PTR(-ENOENT);

	}

	return d_obtain_alias(f2fs_iget(child->d_sb, ino));

	return d_obtain_alias(f2fs_iget(child->d_sb, ino));

}

}
@@ -338,8 +342,11 @@ static int f2fs_unlink(struct inode *dir, struct dentry *dentry) 
	trace_f2fs_unlink_enter(dir, dentry);

	trace_f2fs_unlink_enter(dir, dentry);





	de = f2fs_find_entry(dir, &dentry->d_name, &page);

	de = f2fs_find_entry(dir, &dentry->d_name, &page);

	if (!de)

	if (!de) {

		if (IS_ERR(page))

			err = PTR_ERR(page);

		goto fail;

		goto fail;

	}





	f2fs_balance_fs(sbi, true);

	f2fs_balance_fs(sbi, true);
@@ -658,12 +665,16 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	}

	}





	old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	if (!old_entry)

	if (!old_entry) {

		if (IS_ERR(old_page))

			err = PTR_ERR(old_page);

		goto out;

		goto out;

	}





	if (S_ISDIR(old_inode->i_mode)) {

	if (S_ISDIR(old_inode->i_mode)) {

		old_dir_entry = f2fs_parent_dir(old_inode, &old_dir_page);

		old_dir_entry = f2fs_parent_dir(old_inode, &old_dir_page);

		if (!old_dir_entry) {

		if (!old_dir_entry) {

			if (IS_ERR(old_dir_page))

				err = PTR_ERR(old_dir_page);

				err = PTR_ERR(old_dir_page);

			goto out_old;

			goto out_old;

		}

		}
@@ -684,8 +695,11 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		err = -ENOENT;

		err = -ENOENT;

		new_entry = f2fs_find_entry(new_dir, &new_dentry->d_name,

		new_entry = f2fs_find_entry(new_dir, &new_dentry->d_name,

						&new_page);

						&new_page);

		if (!new_entry)

		if (!new_entry) {

			if (IS_ERR(new_page))

				err = PTR_ERR(new_page);

			goto out_whiteout;

			goto out_whiteout;

		}





		f2fs_balance_fs(sbi, true);

		f2fs_balance_fs(sbi, true);
@@ -743,7 +757,9 @@ static int f2fs_rename(struct inode *old_dir, struct dentry *old_dentry, 
			old_entry = f2fs_find_entry(old_dir,

			old_entry = f2fs_find_entry(old_dir,

						&old_dentry->d_name, &old_page);

						&old_dentry->d_name, &old_page);

			if (!old_entry) {

			if (!old_entry) {

				err = -EIO;

				err = -ENOENT;

				if (IS_ERR(old_page))

					err = PTR_ERR(old_page);

				f2fs_unlock_op(sbi);

				f2fs_unlock_op(sbi);

				goto out_whiteout;

				goto out_whiteout;

			}

			}
@@ -829,12 +845,18 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
		return -EPERM;

		return -EPERM;





	old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	old_entry = f2fs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	if (!old_entry)

	if (!old_entry) {

		if (IS_ERR(old_page))

			err = PTR_ERR(old_page);

		goto out;

		goto out;

	}





	new_entry = f2fs_find_entry(new_dir, &new_dentry->d_name, &new_page);

	new_entry = f2fs_find_entry(new_dir, &new_dentry->d_name, &new_page);

	if (!new_entry)

	if (!new_entry) {

		if (IS_ERR(new_page))

			err = PTR_ERR(new_page);

		goto out_old;

		goto out_old;

	}





	/* prepare for updating ".." directory entry info later */

	/* prepare for updating ".." directory entry info later */

	if (old_dir != new_dir) {

	if (old_dir != new_dir) {
@@ -842,6 +864,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
			old_dir_entry = f2fs_parent_dir(old_inode,

			old_dir_entry = f2fs_parent_dir(old_inode,

							&old_dir_page);

							&old_dir_page);

			if (!old_dir_entry) {

			if (!old_dir_entry) {

				if (IS_ERR(old_dir_page))

					err = PTR_ERR(old_dir_page);

					err = PTR_ERR(old_dir_page);

				goto out_new;

				goto out_new;

			}

			}
@@ -851,6 +874,7 @@ static int f2fs_cross_rename(struct inode *old_dir, struct dentry *old_dentry, 
			new_dir_entry = f2fs_parent_dir(new_inode,

			new_dir_entry = f2fs_parent_dir(new_inode,

							&new_dir_page);

							&new_dir_page);

			if (!new_dir_entry) {

			if (!new_dir_entry) {

				if (IS_ERR(new_dir_page))

					err = PTR_ERR(new_dir_page);

					err = PTR_ERR(new_dir_page);

				goto out_old_dir;

				goto out_old_dir;

			}

			}

fs/f2fs/recovery.c

+5 −2
Original line number Original line Diff line number Diff line
@@ -153,9 +153,12 @@ static int recover_dentry(struct inode *inode, struct page *ipage, 
		f2fs_delete_entry(de, page, dir, einode);

		f2fs_delete_entry(de, page, dir, einode);

		iput(einode);

		iput(einode);

		goto retry;

		goto retry;

	} else if (IS_ERR(page)) {

		err = PTR_ERR(page);

	} else {

		err = __f2fs_add_link(dir, &name, inode,

					inode->i_ino, inode->i_mode);

	}

	}

	err = __f2fs_add_link(dir, &name, inode, inode->i_ino, inode->i_mode);



	goto out;

	goto out;





out_unmap_put:

out_unmap_put: