diff options
author | Jeff Mahoney <jeffm@suse.com> | 2011-10-03 23:22:44 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.cz> | 2012-03-21 20:45:33 -0400 |
commit | b45a9d8b48e5ce534bd222007c43cbf374544f0b (patch) | |
tree | dd08cdb5dd7657a2b6f285246415e777d19e5b86 /fs/btrfs/ctree.h | |
parent | 200a5c17677e1ee8b78382046f3748c9f5816281 (diff) |
btrfs: btrfs_update_root error push-up
btrfs_update_root BUG's when it can't alloc a path, yet it can recover
from a search error. This patch returns -ENOMEM instead.
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Diffstat (limited to 'fs/btrfs/ctree.h')
-rw-r--r-- | fs/btrfs/ctree.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h index a97a67089755..339e637ab272 100644 --- a/fs/btrfs/ctree.h +++ b/fs/btrfs/ctree.h | |||
@@ -2724,9 +2724,10 @@ int btrfs_del_root(struct btrfs_trans_handle *trans, struct btrfs_root *root, | |||
2724 | int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root | 2724 | int btrfs_insert_root(struct btrfs_trans_handle *trans, struct btrfs_root |
2725 | *root, struct btrfs_key *key, struct btrfs_root_item | 2725 | *root, struct btrfs_key *key, struct btrfs_root_item |
2726 | *item); | 2726 | *item); |
2727 | int btrfs_update_root(struct btrfs_trans_handle *trans, struct btrfs_root | 2727 | int __must_check btrfs_update_root(struct btrfs_trans_handle *trans, |
2728 | *root, struct btrfs_key *key, struct btrfs_root_item | 2728 | struct btrfs_root *root, |
2729 | *item); | 2729 | struct btrfs_key *key, |
2730 | struct btrfs_root_item *item); | ||
2730 | int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct | 2731 | int btrfs_find_last_root(struct btrfs_root *root, u64 objectid, struct |
2731 | btrfs_root_item *item, struct btrfs_key *key); | 2732 | btrfs_root_item *item, struct btrfs_key *key); |
2732 | int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid); | 2733 | int btrfs_find_dead_roots(struct btrfs_root *root, u64 objectid); |