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

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

f2fs: allow readdir() to be interrupted 



This patch follows ext4 to allow readdir() in large empty directory to
be interrupted. Referenced commit of ext4: 1f60fbe72749 ("ext4: allow
readdir()'s of large empty directories to be interrupted").

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

fs/f2fs/dir.c

+9 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
 */

#include <linux/fs.h>

#include <linux/f2fs_fs.h>

#include <linux/sched.h>

#include "f2fs.h"

#include "node.h"

#include "acl.h"
@@ -875,6 +876,14 @@ static int f2fs_readdir(struct file *file, struct dir_context *ctx) 
				min(npages - n, (pgoff_t)MAX_DIR_RA_PAGES));



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



		/* allow readdir() to be interrupted */

		if (fatal_signal_pending(current)) {

			err = -ERESTARTSYS;

			goto out_free;

		}

		cond_resched();



		dentry_page = get_lock_data_page(inode, n, false);

		if (IS_ERR(dentry_page)) {

			err = PTR_ERR(dentry_page);