From 24adaab568de9aeb10ffb0c2e050b08b2d559bcd Mon Sep 17 00:00:00 2001 From: Christoph Hellwig Date: Fri, 5 Sep 2008 16:43:28 -0400 Subject: [PATCH] --- yaml --- r: 128927 b: refs/heads/master c: ad3d81ba8f2880dfa3ee518c779a7ea09a024520 h: refs/heads/master i: 128925: 08b25abdc07f6323eab9faab731af5697ad4a2cb 128923: 295321a97af0ee6d1c7e9e589e28fe821845a51e 128919: 2a3a5d382f4c81bdcb52000123b16fc5e6697b51 128911: 7d03e932aef48d81982e4078abfc4898bf669723 128895: 6316572da08750918cef7f4e18ed9bd503ec9683 v: v3 --- [refs] | 2 +- trunk/fs/btrfs/ctree.c | 9 +++++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/[refs] b/[refs] index a66bbdc39df4..d9210a4753bc 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 50ec891cc54fb865c4c40c45845e60123e0e66ca +refs/heads/master: ad3d81ba8f2880dfa3ee518c779a7ea09a024520 diff --git a/trunk/fs/btrfs/ctree.c b/trunk/fs/btrfs/ctree.c index 579124043d9b..6cd4e929bd4d 100644 --- a/trunk/fs/btrfs/ctree.c +++ b/trunk/fs/btrfs/ctree.c @@ -1656,8 +1656,8 @@ static int noinline insert_new_root(struct btrfs_trans_handle *trans, c = btrfs_alloc_free_block(trans, root, root->nodesize, root->root_key.objectid, - root_gen, lower_key.objectid, level, - root->node->start, 0); + root_gen, le64_to_cpu(lower_key.objectid), + level, root->node->start, 0); if (IS_ERR(c)) return PTR_ERR(c); @@ -2352,8 +2352,9 @@ static noinline int split_leaf(struct btrfs_trans_handle *trans, right = btrfs_alloc_free_block(trans, root, root->leafsize, root->root_key.objectid, - root_gen, disk_key.objectid, 0, - l->start, 0); + root_gen, + le64_to_cpu(disk_key.objectid), + 0, l->start, 0); if (IS_ERR(right)) { BUG_ON(1); return PTR_ERR(right);