aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/md/bcache/bset.c
diff options
context:
space:
mode:
authorKent Overstreet <kmo@daterainc.com>2013-10-31 18:46:42 -0400
committerKent Overstreet <kmo@daterainc.com>2013-11-11 00:56:33 -0500
commit81ab4190ac17df41686a37c97f701623276b652a (patch)
treebe7f48b5ad6d36fadbac4658d37953d324d760d0 /drivers/md/bcache/bset.c
parent2599b53b7b0ea6103d1661dca74d35480cb8fa1f (diff)
bcache: Pull on disk data structures out into a separate header
Now, the on disk data structures are in a header that can be exported to userspace - and having them all centralized is nice too. Signed-off-by: Kent Overstreet <kmo@daterainc.com>
Diffstat (limited to 'drivers/md/bcache/bset.c')
-rw-r--r--drivers/md/bcache/bset.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/bcache/bset.c b/drivers/md/bcache/bset.c
index f7b5525ddafa..7b8713c66050 100644
--- a/drivers/md/bcache/bset.c
+++ b/drivers/md/bcache/bset.c
@@ -684,7 +684,7 @@ void bch_bset_init_next(struct btree *b)
684 } else 684 } else
685 get_random_bytes(&i->seq, sizeof(uint64_t)); 685 get_random_bytes(&i->seq, sizeof(uint64_t));
686 686
687 i->magic = bset_magic(b->c); 687 i->magic = bset_magic(&b->c->sb);
688 i->version = 0; 688 i->version = 0;
689 i->keys = 0; 689 i->keys = 0;
690 690
@@ -1034,7 +1034,7 @@ static void __btree_sort(struct btree *b, struct btree_iter *iter,
1034 * memcpy() 1034 * memcpy()
1035 */ 1035 */
1036 1036
1037 out->magic = bset_magic(b->c); 1037 out->magic = bset_magic(&b->c->sb);
1038 out->seq = b->sets[0].data->seq; 1038 out->seq = b->sets[0].data->seq;
1039 out->version = b->sets[0].data->version; 1039 out->version = b->sets[0].data->version;
1040 swap(out, b->sets[0].data); 1040 swap(out, b->sets[0].data);