diff options
| author | Josef Bacik | 2013-07-30 21:44:09 +0200 |
|---|---|---|
| committer | Chris Mason | 2013-09-01 14:04:40 +0200 |
| commit | d062d13cf1a100d5632306a28f9a9f54aced1280 (patch) | |
| tree | fd3bd85c629c61ccdfbc87f5f31f488b887736f0 /fs/btrfs/relocation.c | |
| parent | Btrfs: fix what bits we clear when erroring out from delalloc (diff) | |
| download | kernel-qcow2-linux-d062d13cf1a100d5632306a28f9a9f54aced1280.tar.gz kernel-qcow2-linux-d062d13cf1a100d5632306a28f9a9f54aced1280.tar.xz kernel-qcow2-linux-d062d13cf1a100d5632306a28f9a9f54aced1280.zip | |
Btrfs: check to see if we have an inline item properly
If our item isn't big enough to have an actual inline item when we have skinny
metadata enabled just return 1 in find_inline_backref so we can move on to the
next item. This probably wasn't causing a problem since we check the values of
ptr and end properly, but just in case this will keep us from doing extra work.
Thanks,
Signed-off-by: Josef Bacik <jbacik@fusionio.com>
Signed-off-by: Chris Mason <chris.mason@fusionio.com>
Diffstat (limited to 'fs/btrfs/relocation.c')
| -rw-r--r-- | fs/btrfs/relocation.c | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/fs/btrfs/relocation.c b/fs/btrfs/relocation.c index 5a23d875ab40..8168fb351adb 100644 --- a/fs/btrfs/relocation.c +++ b/fs/btrfs/relocation.c @@ -641,6 +641,11 @@ int find_inline_backref(struct extent_buffer *leaf, int slot, WARN_ON(item_size < sizeof(*ei) + sizeof(*bi)); return 1; } + if (key.type == BTRFS_METADATA_ITEM_KEY && + item_size <= sizeof(*ei)) { + WARN_ON(item_size < sizeof(*ei)); + return 1; + } if (key.type == BTRFS_EXTENT_ITEM_KEY) { bi = (struct btrfs_tree_block_info *)(ei + 1); |