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

Commit 7d2eab19 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: report error of f2fs_fill_dentries 



commit ed6bd4b146527e7c6934e3582c47d7b857802676 upstream.

Report error of f2fs_fill_dentries to ->iterate_shared, otherwise when
error ocurrs, user may just list part of dirents in target directory
without any hints.

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

fs/f2fs/dir.c

+12 −9
Original line number Diff line number Diff line
@@ -785,7 +785,7 @@ bool f2fs_empty_dir(struct inode *dir) 
	return true;

}



bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,

int f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d,

			unsigned int start_pos, struct fscrypt_str *fstr)

{

	unsigned char d_type = DT_UNKNOWN;
@@ -820,7 +820,7 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 
						(u32)de->hash_code, 0,

						&de_name, fstr);

			if (err)

				return true;

				return err;



			de_name = *fstr;

			fstr->len = save_len;
@@ -828,12 +828,12 @@ bool f2fs_fill_dentries(struct dir_context *ctx, struct f2fs_dentry_ptr *d, 


		if (!dir_emit(ctx, de_name.name, de_name.len,

					le32_to_cpu(de->ino), d_type))

			return true;

			return 1;



		bit_pos += GET_DENTRY_SLOTS(le16_to_cpu(de->name_len));

		ctx->pos = start_pos + bit_pos;

	}

	return false;

	return 0;

}



static int f2fs_readdir(struct file *file, struct dir_context *ctx)
@@ -872,17 +872,21 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
		dentry_page = get_lock_data_page(inode, n, false);

		if (IS_ERR(dentry_page)) {

			err = PTR_ERR(dentry_page);

			if (err == -ENOENT)

			if (err == -ENOENT) {

				err = 0;

				continue;

			else

			} else {

				goto out;

			}

		}



		dentry_blk = kmap(dentry_page);



		make_dentry_ptr(inode, &d, (void *)dentry_blk, 1);



		if (f2fs_fill_dentries(ctx, &d, n * NR_DENTRY_IN_BLOCK, &fstr)) {

		err = f2fs_fill_dentries(ctx, &d,

				n * NR_DENTRY_IN_BLOCK, &fstr);

		if (err) {

			kunmap(dentry_page);

			f2fs_put_page(dentry_page, 1);

			break;
@@ -892,10 +896,9 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
		kunmap(dentry_page);

		f2fs_put_page(dentry_page, 1);

	}

	err = 0;

out:

	fscrypt_fname_free_buffer(&fstr);

	return err;

	return err < 0 ? err : 0;

}



static int f2fs_dir_open(struct inode *inode, struct file *filp)

fs/f2fs/f2fs.h

+1 −1
Original line number Diff line number Diff line
@@ -2014,7 +2014,7 @@ void set_de_type(struct f2fs_dir_entry *, umode_t); 
unsigned char get_de_type(struct f2fs_dir_entry *);

struct f2fs_dir_entry *find_target_dentry(struct fscrypt_name *,

			f2fs_hash_t, int *, struct f2fs_dentry_ptr *);

bool f2fs_fill_dentries(struct dir_context *, struct f2fs_dentry_ptr *,

int f2fs_fill_dentries(struct dir_context *, struct f2fs_dentry_ptr *,

			unsigned int, struct fscrypt_str *);

void do_make_empty_dir(struct inode *, struct inode *,

			struct f2fs_dentry_ptr *);

fs/f2fs/inline.c

+4 −2
Original line number Diff line number Diff line
@@ -629,6 +629,7 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx, 
	struct f2fs_inline_dentry *inline_dentry = NULL;

	struct page *ipage = NULL;

	struct f2fs_dentry_ptr d;

	int err;



	if (ctx->pos == NR_INLINE_DENTRY)

		return 0;
@@ -641,11 +642,12 @@ int f2fs_read_inline_dir(struct file *file, struct dir_context *ctx, 


	make_dentry_ptr(inode, &d, (void *)inline_dentry, 2);



	if (!f2fs_fill_dentries(ctx, &d, 0, fstr))

	err = f2fs_fill_dentries(ctx, &d, 0, fstr);

	if (!err)

		ctx->pos = NR_INLINE_DENTRY;



	f2fs_put_page(ipage, 1);

	return 0;

	return err < 0 ? err : 0;

}



int f2fs_inline_data_fiemap(struct inode *inode,