OSDN Git Service

f2fs: allow readdir() to be interrupted
authorChao Yu <yuchao0@huawei.com>
Fri, 13 Oct 2017 10:01:34 +0000 (18:01 +0800)
committerJaegeuk Kim <jaegeuk@kernel.org>
Thu, 16 Nov 2017 05:58:01 +0000 (21:58 -0800)
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: Chao Yu <yuchao0@huawei.com>
Signed-off-by: Jaegeuk Kim <jaegeuk@kernel.org>
fs/f2fs/dir.c

index c745f97..95500ea 100644 (file)
@@ -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);