From e5c99ac52310a0ea7ac0b8f7abf4f9818e9a61a3 Mon Sep 17 00:00:00 2001 From: Yan Zheng Date: Fri, 19 Oct 2007 09:22:56 -0400 Subject: [PATCH] --- yaml --- r: 128499 b: refs/heads/master c: 44b36eb20bb60d7da1375c1fb45784740a4dc358 h: refs/heads/master i: 128497: 18e8f72243c1ea7ade7d6dc62f04c7e38235dd91 128495: 93c8db5fc5e99b4c4a21a68dc3b2127bae9c7b5e v: v3 --- [refs] | 2 +- trunk/fs/btrfs/disk-io.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/[refs] b/[refs] index 567c3afa612e..24dbd3b6dc02 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6d7231f7d33fc14f2d41abc3b9cb28dcb208735d +refs/heads/master: 44b36eb20bb60d7da1375c1fb45784740a4dc358 diff --git a/trunk/fs/btrfs/disk-io.c b/trunk/fs/btrfs/disk-io.c index 5accced2858a..5a7e60d7f443 100644 --- a/trunk/fs/btrfs/disk-io.c +++ b/trunk/fs/btrfs/disk-io.c @@ -410,6 +410,7 @@ struct btrfs_root *btrfs_read_fs_root_no_radix(struct btrfs_fs_info *fs_info, read_extent_buffer(l, &root->root_item, btrfs_item_ptr_offset(l, path->slots[0]), sizeof(root->root_item)); + memcpy(&root->root_key, location, sizeof(*location)); ret = 0; out: btrfs_release_path(root, path);