diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2014-07-27 21:00:41 +0400 |
|---|---|---|
| committer | Luis Henriques <luis.henriques@canonical.com> | 2014-11-14 18:20:07 +0300 |
| commit | 4595138c089fd550ef3e773205dfed626dbbfe3d (patch) | |
| tree | e59ab2d33e65f06c9e92d3ece3fe2a71a57e9e90 /fs/buffer.c | |
| parent | aadefebf34df8c74cf2aa6e35459e258c85047c0 (diff) | |
| download | linux-4595138c089fd550ef3e773205dfed626dbbfe3d.tar.xz | |
fs: make cont_expand_zero interruptible
commit c2ca0fcd202863b14bd041a7fece2e789926c225 upstream.
This patch makes it possible to kill a process looping in
cont_expand_zero. A process may spend a lot of time in this function, so
it is desirable to be able to kill it.
It happened to me that I wanted to copy a piece data from the disk to a
file. By mistake, I used the "seek" parameter to dd instead of "skip". Due
to the "seek" parameter, dd attempted to extend the file and became stuck
doing so - the only possibility was to reset the machine or wait many
hours until the filesystem runs out of space and cont_expand_zero fails.
We need this patch to be able to terminate the process.
Signed-off-by: Mikulas Patocka <mpatocka@redhat.com>
Signed-off-by: Al Viro <viro@zeniv.linux.org.uk>
Signed-off-by: Luis Henriques <luis.henriques@canonical.com>
Diffstat (limited to 'fs/buffer.c')
| -rw-r--r-- | fs/buffer.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/buffer.c b/fs/buffer.c index 19a78d074e0d..4752094053f9 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2328,6 +2328,11 @@ static int cont_expand_zero(struct file *file, struct address_space *mapping, err = 0; balance_dirty_pages_ratelimited(mapping); + + if (unlikely(fatal_signal_pending(current))) { + err = -EINTR; + goto out; + } } /* page covers the boundary, find the boundary offset */ |