diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2016-04-23 22:50:07 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2016-04-23 22:50:07 -0400 |
| commit | 1f60fbe7274918adb8db2f616e321890730ab7e3 (patch) | |
| tree | 4e41c7a0fd5204cad9e651baa23207bf4dafe256 /fs/readdir.c | |
| parent | c3b46c73264b03000d1e18b22f5caf63332547c9 (diff) | |
| download | linux-1f60fbe7274918adb8db2f616e321890730ab7e3.tar.bz2 | |
ext4: allow readdir()'s of large empty directories to be interrupted
If a directory has a large number of empty blocks, iterating over all
of them can take a long time, leading to scheduler warnings and users
getting irritated when they can't kill a process in the middle of one
of these long-running readdir operations. Fix this by adding checks to
ext4_readdir() and ext4_htree_fill_tree().
This was reverted earlier due to a typo in the original commit where I
experimented with using signal_pending() instead of
fatal_signal_pending(). The test was in the wrong place if we were
going to return signal_pending() since we would end up returning
duplicant entries. See 9f2394c9be47 for a more detailed explanation.
Added fix as suggested by Linus to check for signal_pending() in
in the filldir() functions.
Reported-by: Benjamin LaHaise <bcrl@kvack.org>
Google-Bug-Id: 27880676
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Diffstat (limited to 'fs/readdir.c')
| -rw-r--r-- | fs/readdir.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/fs/readdir.c b/fs/readdir.c index e69ef3b79787..5f2d4bee5a73 100644 --- a/fs/readdir.c +++ b/fs/readdir.c @@ -169,6 +169,8 @@ static int filldir(struct dir_context *ctx, const char *name, int namlen, } dirent = buf->previous; if (dirent) { + if (signal_pending(current)) + return -EINTR; if (__put_user(offset, &dirent->d_off)) goto efault; } @@ -248,6 +250,8 @@ static int filldir64(struct dir_context *ctx, const char *name, int namlen, return -EINVAL; dirent = buf->previous; if (dirent) { + if (signal_pending(current)) + return -EINTR; if (__put_user(offset, &dirent->d_off)) goto efault; } |