From 8053c9bf39ed29f8dee9a60507da04319eb6af32 Mon Sep 17 00:00:00 2001 From: Jan Schmidt Date: Fri, 23 Mar 2012 17:24:19 +0100 Subject: [PATCH] --- yaml --- r: 297905 b: refs/heads/master c: 103e976616fe9c2a3e40764c979fa1a592274da2 h: refs/heads/master i: 297903: 882fc579462efd92b854866dfe89b3d18a64b818 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/transaction.c | 6 ++++-- 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index bbc51a4a7123..b2ce9329b847 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: e565d4b962948e70f37f417603caf131a773621b +refs/heads/master: 103e976616fe9c2a3e40764c979fa1a592274da2 diff --git a/trunk/fs/btrfs/transaction.c b/trunk/fs/btrfs/transaction.c index 04b77e3ceb7a..cd220f283638 100644 --- a/trunk/fs/btrfs/transaction.c +++ b/trunk/fs/btrfs/transaction.c @@ -718,7 +718,8 @@ static noinline int commit_cowonly_roots(struct btrfs_trans_handle *trans, BUG_ON(ret); eb = btrfs_lock_root_node(fs_info->tree_root); - btrfs_cow_block(trans, fs_info->tree_root, eb, NULL, 0, &eb); + ret = btrfs_cow_block(trans, fs_info->tree_root, eb, NULL, 0, &eb); + BUG_ON(ret); btrfs_tree_unlock(eb); free_extent_buffer(eb); @@ -949,7 +950,8 @@ static noinline int create_pending_snapshot(struct btrfs_trans_handle *trans, btrfs_set_root_flags(new_root_item, root_flags); old = btrfs_lock_root_node(root); - btrfs_cow_block(trans, root, old, NULL, 0, &old); + ret = btrfs_cow_block(trans, root, old, NULL, 0, &old); + BUG_ON(ret); btrfs_set_lock_blocking(old); btrfs_copy_root(trans, root, old, &tmp, objectid);