diff options
author | Naohiro Aota <naohiro.aota@wdc.com> | 2017-09-08 04:48:55 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2017-09-26 08:52:31 -0400 |
commit | 78ad4ce014d025f41b8dde3a81876832ead643cf (patch) | |
tree | 902bf4b9ff9285500a6ff8b00a608c21395ed655 | |
parent | 6d6d282932d1a609e60dc4467677e0e863682f57 (diff) |
btrfs: propagate error to btrfs_cmp_data_prepare caller
btrfs_cmp_data_prepare() (almost) always returns 0 i.e. ignoring errors
from gather_extent_pages(). While the pages are freed by
btrfs_cmp_data_free(), cmp->num_pages still has > 0. Then,
btrfs_extent_same() try to access the already freed pages causing faults
(or violates PageLocked assertion).
This patch just return the error as is so that the caller stop the process.
Signed-off-by: Naohiro Aota <naohiro.aota@wdc.com>
Fixes: f441460202cb ("btrfs: fix deadlock with extent-same and readpage")
Cc: <stable@vger.kernel.org> # 4.2
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>
-rw-r--r-- | fs/btrfs/ioctl.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index d4a77993e52f..802df5755cd3 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c | |||
@@ -3028,7 +3028,7 @@ static int btrfs_cmp_data_prepare(struct inode *src, u64 loff, | |||
3028 | out: | 3028 | out: |
3029 | if (ret) | 3029 | if (ret) |
3030 | btrfs_cmp_data_free(cmp); | 3030 | btrfs_cmp_data_free(cmp); |
3031 | return 0; | 3031 | return ret; |
3032 | } | 3032 | } |
3033 | 3033 | ||
3034 | static int btrfs_cmp_data(u64 len, struct cmp_pages *cmp) | 3034 | static int btrfs_cmp_data(u64 len, struct cmp_pages *cmp) |