diff options
| author | Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com> | 2016-10-13 04:23:39 +0300 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2017-01-06 13:16:21 +0300 |
| commit | fc1d3e5f3cd0a9f3bf173c19d321102e406f8d2f (patch) | |
| tree | c378dd4a677c3e9a24ca7a2fb888c2d5cebe3588 | |
| parent | 8c59356c12322d26e597156558b6361536c8ca86 (diff) | |
| download | linux-fc1d3e5f3cd0a9f3bf173c19d321102e406f8d2f.tar.xz | |
btrfs: make file clone aware of fatal signals
commit 69ae5e4459e43e56f03d0987e865fbac2b05af2a upstream.
Indeed this just make the behavior similar to xfs when process has
fatal signals pending, and it'll make fstests/generic/298 happy.
Signed-off-by: Wang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
| -rw-r--r-- | fs/btrfs/ioctl.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 7fd939bfbd99..fcd2b3be21bf 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3813,6 +3813,11 @@ process_slot: } btrfs_release_path(path); key.offset = next_key_min_offset; + + if (fatal_signal_pending(current)) { + ret = -EINTR; + goto out; + } } ret = 0; |