summaryrefslogtreecommitdiffstats
path: root/fs/btrfs/send.c
diff options
context:
space:
mode:
authorJosef Bacik2013-10-31 21:49:02 +0100
committerChris Mason2013-11-12 04:12:49 +0100
commit007d31f755294b9db69c3d18e90d6edae9f1604d (patch)
treec4961e7d434b24c55a8f747aa5039b6cafe76200 /fs/btrfs/send.c
parentbtrfs: Remove useless variable in write_ctree_super() (diff)
downloadkernel-qcow2-linux-007d31f755294b9db69c3d18e90d6edae9f1604d.tar.gz
kernel-qcow2-linux-007d31f755294b9db69c3d18e90d6edae9f1604d.tar.xz
kernel-qcow2-linux-007d31f755294b9db69c3d18e90d6edae9f1604d.zip
Btrfs: check file extent type before anything else
I hit this problem with my no holes patch and it made me realize what the problem was for bz 60834. If the first item in the leaf is an inline extent and we try to read anything starting from disk_bytenr onward we will read off the end of the leaf. So we need to check to see what it's type is, and if it's not REG we can just break out. This should fix this problem. Thanks, Signed-off-by: Josef Bacik <jbacik@fusionio.com> Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/send.c')
-rw-r--r--fs/btrfs/send.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/send.c b/fs/btrfs/send.c
index ec2f02435287..6837fe87f3a6 100644
--- a/fs/btrfs/send.c
+++ b/fs/btrfs/send.c
@@ -3902,16 +3902,16 @@ static int is_extent_unchanged(struct send_ctx *sctx,
while (key.offset < ekey->offset + left_len) {
ei = btrfs_item_ptr(eb, slot, struct btrfs_file_extent_item);
right_type = btrfs_file_extent_type(eb, ei);
- right_disknr = btrfs_file_extent_disk_bytenr(eb, ei);
- right_len = btrfs_file_extent_num_bytes(eb, ei);
- right_offset = btrfs_file_extent_offset(eb, ei);
- right_gen = btrfs_file_extent_generation(eb, ei);
-
if (right_type != BTRFS_FILE_EXTENT_REG) {
ret = 0;
goto out;
}
+ right_disknr = btrfs_file_extent_disk_bytenr(eb, ei);
+ right_len = btrfs_file_extent_num_bytes(eb, ei);
+ right_offset = btrfs_file_extent_offset(eb, ei);
+ right_gen = btrfs_file_extent_generation(eb, ei);
+
/*
* Are we at extent 8? If yes, we know the extent is changed.
* This may only happen on the first iteration.