]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
btrfs: make file clone aware of fatal signals
authorWang Xiaoguang <wangxg.fnst@cn.fujitsu.com>
Thu, 13 Oct 2016 01:23:39 +0000 (09:23 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 6 Jan 2017 10:16:21 +0000 (11:16 +0100)
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>
fs/btrfs/ioctl.c

index 7fd939bfbd99359b3ffab8b9689d8fdd2b313aeb..fcd2b3be21bf2ec4e1e3d350adae91f19293b3af 100644 (file)
@@ -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;