diff options
| author | Tsutomu Itoh <t-itoh@jp.fujitsu.com> | 2011-03-23 08:14:16 +0000 |
|---|---|---|
| committer | root <Chris Mason chris.mason@oracle.com> | 2011-03-28 05:37:35 -0400 |
| commit | db5b493ac78e46c7b6bad22cd25d8041564cd8ea (patch) | |
| tree | 18f484c3d8194b80165e5400831931a3ac5c58ba /fs/btrfs/disk-io.c | |
| parent | 1abe9b8a138c9988ba8f7bfded6453649a31541f (diff) | |
| download | kernel_samsung_smdk4412-db5b493ac78e46c7b6bad22cd25d8041564cd8ea.zip kernel_samsung_smdk4412-db5b493ac78e46c7b6bad22cd25d8041564cd8ea.tar.gz kernel_samsung_smdk4412-db5b493ac78e46c7b6bad22cd25d8041564cd8ea.tar.bz2 | |
Btrfs: cleanup some BUG_ON()
This patch changes some BUG_ON() to the error return.
(but, most callers still use BUG_ON())
Signed-off-by: Tsutomu Itoh <t-itoh@jp.fujitsu.com>
Signed-off-by: Chris Mason <chris.mason@oracle.com>
Diffstat (limited to 'fs/btrfs/disk-io.c')
| -rw-r--r-- | fs/btrfs/disk-io.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/fs/btrfs/disk-io.c b/fs/btrfs/disk-io.c index 9f31e11..00cbb41 100644 --- a/fs/btrfs/disk-io.c +++ b/fs/btrfs/disk-io.c @@ -1248,7 +1248,10 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_root *tree_root, root, fs_info, location->objectid); path = btrfs_alloc_path(); - BUG_ON(!path); + if (!path) { + kfree(root); + return ERR_PTR(-ENOMEM); + } ret = btrfs_search_slot(NULL, tree_root, location, path, 0, 0); if (ret == 0) { l = path->nodes[0]; |