From 0cc3693d13103b79e4911c6943f8edc47a74d3b4 Mon Sep 17 00:00:00 2001 From: Jeff Mahoney Date: Mon, 3 Oct 2011 23:22:44 -0400 Subject: [PATCH] --- yaml --- r: 297866 b: refs/heads/master c: b45a9d8b48e5ce534bd222007c43cbf374544f0b h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ctree.h | 7 ++++--- trunk/fs/btrfs/root-tree.c | 4 +++- 3 files changed, 8 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index 8b2383b59eef..8364023fd94a 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 200a5c17677e1ee8b78382046f3748c9f5816281 +refs/heads/master: b45a9d8b48e5ce534bd222007c43cbf374544f0b diff --git a/trunk/fs/btrfs/ctree.h b/trunk/fs/btrfs/ctree.h index a97a67089755..339e637ab272 100644 --- a/trunk/fs/btrfs/ctree.h +++ b/trunk/fs/btrfs/ctree.h @@ -2724,9 +2724,10 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, struct btrfs_key *key, struct btrfs_root_item *item); -int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root - *root, struct btrfs_key *key, struct btrfs_root_item - *item); +int __must_check btrfs_update_root(struct btrfs_trans_handle *trans, + struct btrfs_root *root, + struct btrfs_key *key, + struct btrfs_root_item *item); int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct btrfs_root_item *item, struct btrfs_key *key); int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid); diff --git a/trunk/fs/btrfs/root-tree.c b/trunk/fs/btrfs/root-tree.c index 1fd93d63707f..1486cf9de1da 100644 --- a/trunk/fs/btrfs/root-tree.c +++ b/trunk/fs/btrfs/root-tree.c @@ -93,7 +93,9 @@ int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root unsigned long ptr; path = btrfs_alloc_path(); - BUG_ON(!path); + if (!path) + return -ENOMEM; + ret = btrfs_search_slot(trans, root, key, path, 0, 1); if (ret < 0) goto out;