diff options
| author | Byongho Lee <bhlee.kernel@gmail.com> | 2016-01-04 10:01:32 +0900 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2016-01-12 15:01:05 +0100 |
| commit | e55eb2e51a8d2396dcf4a809efb50567a7bf5aa4 (patch) | |
| tree | 3d4e987beec8cb582cd9816bcdb22d4052356fc6 /chunk-recover.c | |
| parent | 24b73dff7bd682b78cae945db88254b47b9939a0 (diff) | |
btrfs-progs: fix endian bugs in chunk rebuilding
This is a same patch as Zach Brown's but we lost so I resend it based on
current code.
- 'commit 2cd95f945a61 ("fix endian bugs in chunk rebuilding")'
Signed-off-by: Zach Brown <zab@redhat.com>
Signed-off-by: Byongho Lee <bhlee.kernel@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'chunk-recover.c')
| -rw-r--r-- | chunk-recover.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/chunk-recover.c b/chunk-recover.c index 85dc1bca..b03330b4 100644 --- a/chunk-recover.c +++ b/chunk-recover.c @@ -1159,9 +1159,9 @@ static int __rebuild_chunk_root(struct btrfs_trans_handle *trans, if (min_devid > dev->devid) min_devid = dev->devid; } - disk_key.objectid = BTRFS_DEV_ITEMS_OBJECTID; - disk_key.type = BTRFS_DEV_ITEM_KEY; - disk_key.offset = min_devid; + btrfs_set_disk_key_objectid(&disk_key, BTRFS_DEV_ITEMS_OBJECTID); + btrfs_set_disk_key_type(&disk_key, BTRFS_DEV_ITEM_KEY); + btrfs_set_disk_key_offset(&disk_key, min_devid); cow = btrfs_alloc_free_block(trans, root, root->nodesize, BTRFS_CHUNK_TREE_OBJECTID, @@ -1234,7 +1234,7 @@ static int __insert_chunk_item(struct btrfs_trans_handle *trans, key.offset = chunk_rec->offset; ret = btrfs_insert_item(trans, chunk_root, &key, chunk, - btrfs_chunk_item_size(chunk->num_stripes)); + btrfs_chunk_item_size(chunk_rec->num_stripes)); free(chunk); return ret; } |