summaryrefslogtreecommitdiffstats
path: root/fs/btrfs
diff options
context:
space:
mode:
authorJosef Bacik <jbacik@fusionio.com>2013-05-08 13:30:11 -0400
committerJosef Bacik <jbacik@fusionio.com>2013-05-17 21:40:12 -0400
commit69a85bd87cc81bcbd36730d4a1214c12fdb8a548 (patch)
treebe462401400f8df123ba89296c300d95fb804fc2 /fs/btrfs
parent03b71c6ca6286625d8f1ed44aabab9b5bf5dac10 (diff)
downloadop-kernel-dev-69a85bd87cc81bcbd36730d4a1214c12fdb8a548.zip
op-kernel-dev-69a85bd87cc81bcbd36730d4a1214c12fdb8a548.tar.gz
Btrfs: don't null pointer deref on abort
I'm sorry, theres no excuse for this sort of work. We need to use root->leafsize since eb may be NULL. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Diffstat (limited to 'fs/btrfs')
-rw-r--r--fs/btrfs/disk-io.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c
index 72b1727..e8b29da 100644
--- a/fs/btrfs/disk-io.c
+++ b/fs/btrfs/disk-io.c
@@ -3808,7 +3808,7 @@ static int btrfs_destroy_marked_extents(struct btrfs_root *root,
while (start <= end) {
eb = btrfs_find_tree_block(root, start,
root->leafsize);
- start += eb->len;
+ start += root->leafsize;
if (!eb)
continue;
wait_on_extent_buffer_writeback(eb);
OpenPOWER on IntegriCloud