diff options
| author | Mikulas Patocka <mpatocka@redhat.com> | 2014-07-27 21:00:41 +0400 |
|---|---|---|
| committer | Jiri Slaby <jslaby@suse.cz> | 2014-11-13 21:02:09 +0300 |
| commit | b99b3db3dd136f694fced42552c4b927b5364f2f (patch) | |
| tree | b6de893b82fc67bbe818074470e454b933ec5c23 /fs/buffer.c | |
| parent | 87394e735e609660eceb70e505f6d8b7c7a1eaba (diff) | |
| download | linux-b99b3db3dd136f694fced42552c4b927b5364f2f.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: Jiri Slaby <jslaby@suse.cz>
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 fe2182ec812d..dc1107fec557 100644 --- a/fs/buffer.c +++ b/fs/buffer.c @@ -2325,6 +2325,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 */ |