diff options
| author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2011-05-19 07:03:42 +0000 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2011-05-23 13:24:39 -0400 |
| commit | b0b802d7e34b0b4a78f911c3a8aad88aa91fd7ab (patch) | |
| tree | a921d73b19363e2f29c20265716f8f281fc3f87c | |
| parent | 27160b6b5a1744b6eaa8416e2b901ec937b1eee0 (diff) | |
| download | kernel_samsung_aries-b0b802d7e34b0b4a78f911c3a8aad88aa91fd7ab.zip kernel_samsung_aries-b0b802d7e34b0b4a78f911c3a8aad88aa91fd7ab.tar.gz kernel_samsung_aries-b0b802d7e34b0b4a78f911c3a8aad88aa91fd7ab.tar.bz2 | |
Btrfs: return error code to caller when btrfs_previous_item fails
The error code is returned instead of calling BUG_ON when
btrfs_previous_item returns the error.
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
| -rw-r--r-- | fs/btrfs/volumes.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c index c7367ae..e40cdd5 100644 --- a/fs/btrfs/volumes.c +++ b/fs/btrfs/volumes.c @@ -949,14 +949,14 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans, if (ret > 0) { ret = btrfs_previous_item(root, path, key.objectid, BTRFS_DEV_EXTENT_KEY); - BUG_ON(ret); + if (ret) + goto out; leaf = path->nodes[0]; btrfs_item_key_to_cpu(leaf, &found_key, path->slots[0]); extent = btrfs_item_ptr(leaf, path->slots[0], struct btrfs_dev_extent); BUG_ON(found_key.offset > start || found_key.offset + btrfs_dev_extent_length(leaf, extent) < start); - ret = 0; } else if (ret == 0) { leaf = path->nodes[0]; extent = btrfs_item_ptr(leaf, path->slots[0], @@ -969,6 +969,7 @@ static int btrfs_free_dev_extent(struct btrfs_trans_handle *trans, ret = btrfs_del_item(trans, root, path); BUG_ON(ret); +out: btrfs_free_path(path); return ret; } |