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

Commit 372b93f9 authored by Chao Yu's avatar Chao Yu Committed by Jaegeuk Kim
Browse files

f2fs: relocate readahead codes in readdir() 



Previously, for large directory, we just do readahead only once in
readdir(), readdir()'s performance may drop when traversing latter
blocks. In order to avoid this, relocate readahead codes to covering
all traverse flow.

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

fs/f2fs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -870,11 +870,6 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
		goto out_free;

	}



	/* readahead for multi pages of dir */

	if (npages - n > 1 && !ra_has_index(ra, n))

		page_cache_sync_readahead(inode->i_mapping, ra, file, n,

				min(npages - n, (pgoff_t)MAX_DIR_RA_PAGES));



	for (; n < npages; n++) {



		/* allow readdir() to be interrupted */
@@ -884,6 +879,11 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
		}

		cond_resched();



		/* readahead for multi pages of dir */

		if (npages - n > 1 && !ra_has_index(ra, n))

			page_cache_sync_readahead(inode->i_mapping, ra, file, n,

				min(npages - n, (pgoff_t)MAX_DIR_RA_PAGES));



		dentry_page = get_lock_data_page(inode, n, false);

		if (IS_ERR(dentry_page)) {

			err = PTR_ERR(dentry_page);