diff --git a/[refs] b/[refs] index 8c2e06dc4b6d..f6a2a94cbb74 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c00e9493f1412621c8665a707d63e32b0768f572 +refs/heads/master: 37daa4f968e9470ae9f30e246a5781717c598271 diff --git a/trunk/fs/btrfs/tree-log.c b/trunk/fs/btrfs/tree-log.c index 46b7b57650ab..c2d887566400 100644 --- a/trunk/fs/btrfs/tree-log.c +++ b/trunk/fs/btrfs/tree-log.c @@ -589,6 +589,7 @@ static noinline int replay_one_extent(struct btrfs_trans_handle *trans, ins.objectid, ins.offset, 0, root->root_key.objectid, key->objectid, offset); + BUG_ON(ret); } else { /* * insert the extent pointer in the extent