Unverified Commit 64831cb2 authored by openeuler-ci-bot's avatar openeuler-ci-bot Committed by Gitee
Browse files

!13396 [sync] PR-13347: nilfs2: propagate directory read errors from nilfs_find_entry() 

Merge Pull Request from: @openeuler-sync-bot 
 

Origin pull request: 
https://gitee.com/openeuler/kernel/pulls/13347 
 
PR sync from: Baokun Li <libaokun1@huawei.com>
https://mailweb.openeuler.org/hyperkitty/list/kernel@openeuler.org/message/LTLPZWJRPJZELKLKDO3OEEH4QSORZGQI/ 
 
https://gitee.com/src-openeuler/kernel/issues/IB2YWL 
 
Link:https://gitee.com/openeuler/kernel/pulls/13396

 

Reviewed-by: default avatarLi Nan <linan122@huawei.com>
Signed-off-by: default avatarLi Nan <linan122@huawei.com>
parents b72e8e32 4369f5ad

fs/nilfs2/dir.c

+27 −23
Original line number Diff line number Diff line
@@ -331,6 +331,8 @@ static int nilfs_readdir(struct file *file, struct dir_context *ctx) 
 * returns the page in which the entry was found, and the entry itself

 * (as a parameter - res_dir). Page is returned mapped and unlocked.

 * Entry is guaranteed to be valid.

 *

 * On failure, returns an error pointer and the caller should ignore res_page.

 */

struct nilfs_dir_entry *

nilfs_find_entry(struct inode *dir, const struct qstr *qstr,
@@ -358,7 +360,9 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, 
	do {

		char *kaddr = nilfs_get_page(dir, n, &page);



		if (!IS_ERR(kaddr)) {

		if (IS_ERR(kaddr))

			return ERR_CAST(kaddr);



		de = (struct nilfs_dir_entry *)kaddr;

		kaddr += nilfs_last_byte(dir, n) - reclen;

		while ((char *)de <= kaddr) {
@@ -373,7 +377,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, 
			de = nilfs_next_entry(de);

		}

		nilfs_put_page(page);

		}



		if (++n >= npages)

			n = 0;

		/* next page is past the blocks we've got */
@@ -386,7 +390,7 @@ nilfs_find_entry(struct inode *dir, const struct qstr *qstr, 
		}

	} while (n != start);

out:

	return NULL;

	return ERR_PTR(-ENOENT);



found:

	*res_page = page;
@@ -431,19 +435,19 @@ struct nilfs_dir_entry *nilfs_dotdot(struct inode *dir, struct page **p) 
	return NULL;

}



ino_t nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr)

int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino)

{

	ino_t res = 0;

	struct nilfs_dir_entry *de;

	struct page *page;



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

	if (de) {

		res = le64_to_cpu(de->inode);

	if (IS_ERR(de))

		return PTR_ERR(de);



	*ino = le64_to_cpu(de->inode);

	kunmap(page);

	put_page(page);

	}

	return res;

	return 0;

}



/* Releases the page */

fs/nilfs2/namei.c

+26 −13
Original line number Diff line number Diff line
@@ -55,12 +55,20 @@ nilfs_lookup(struct inode *dir, struct dentry *dentry, unsigned int flags) 
{

	struct inode *inode;

	ino_t ino;

	int res;



	if (dentry->d_name.len > NILFS_NAME_LEN)

		return ERR_PTR(-ENAMETOOLONG);



	ino = nilfs_inode_by_name(dir, &dentry->d_name);

	inode = ino ? nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino) : NULL;

	res = nilfs_inode_by_name(dir, &dentry->d_name, &ino);

	if (res) {

		if (res != -ENOENT)

			return ERR_PTR(res);

		inode = NULL;

	} else {

		inode = nilfs_iget(dir->i_sb, NILFS_I(dir)->i_root, ino);

	}



	return d_splice_alias(inode, dentry);

}
@@ -264,10 +272,11 @@ static int nilfs_do_unlink(struct inode *dir, struct dentry *dentry) 
	struct page *page;

	int err;



	err = -ENOENT;

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

	if (!de)

	if (IS_ERR(de)) {

		err = PTR_ERR(de);

		goto out;

	}



	inode = d_inode(dentry);

	err = -EIO;
@@ -361,10 +370,11 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
	if (unlikely(err))

		return err;



	err = -ENOENT;

	old_de = nilfs_find_entry(old_dir, &old_dentry->d_name, &old_page);

	if (!old_de)

	if (IS_ERR(old_de)) {

		err = PTR_ERR(old_de);

		goto out;

	}



	if (S_ISDIR(old_inode->i_mode)) {

		err = -EIO;
@@ -381,10 +391,12 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
		if (dir_de && !nilfs_empty_dir(new_inode))

			goto out_dir;



		err = -ENOENT;

		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name, &new_page);

		if (!new_de)

		new_de = nilfs_find_entry(new_dir, &new_dentry->d_name,

					  &new_page);

		if (IS_ERR(new_de)) {

			err = PTR_ERR(new_de);

			goto out_dir;

		}

		nilfs_set_link(new_dir, new_de, new_page, old_inode);

		nilfs_mark_inode_dirty(new_dir);

		new_inode->i_ctime = current_time(new_inode);
@@ -438,14 +450,15 @@ static int nilfs_rename(struct inode *old_dir, struct dentry *old_dentry, 
 */

static struct dentry *nilfs_get_parent(struct dentry *child)

{

	unsigned long ino;

	ino_t ino;

	int res;

	struct inode *inode;

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

	struct nilfs_root *root;



	ino = nilfs_inode_by_name(d_inode(child), &dotdot);

	if (!ino)

		return ERR_PTR(-ENOENT);

	res = nilfs_inode_by_name(d_inode(child), &dotdot, &ino);

	if (res)

		return ERR_PTR(res);



	root = NILFS_I(d_inode(child))->i_root;

fs/nilfs2/nilfs.h

+1 −1
Original line number Diff line number Diff line
@@ -233,7 +233,7 @@ static inline __u32 nilfs_mask_flags(umode_t mode, __u32 flags) 


/* dir.c */

extern int nilfs_add_link(struct dentry *, struct inode *);

extern ino_t nilfs_inode_by_name(struct inode *, const struct qstr *);

int nilfs_inode_by_name(struct inode *dir, const struct qstr *qstr, ino_t *ino);

extern int nilfs_make_empty(struct inode *, struct inode *);

extern struct nilfs_dir_entry *

nilfs_find_entry(struct inode *, const struct qstr *, struct page **);