Commit cf49f8a8 authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: rename version -> bversion 



give bversions a more distinct name, to aid in grepping

Signed-off-by: default avatarKent Overstreet <kent.overstreet@linux.dev>
parent fd65378d

fs/bcachefs/backpointers.c

+1 −1
Original line number Diff line number Diff line
@@ -501,7 +501,7 @@ static int check_extent_checksum(struct btree_trans *trans, 
	prt_printf(&buf, "\n  %s ", bch2_btree_id_str(o_btree));

	bch2_bkey_val_to_text(&buf, c, extent2);



	struct nonce nonce = extent_nonce(extent.k->version, p.crc);

	struct nonce nonce = extent_nonce(extent.k->bversion, p.crc);

	struct bch_csum csum = bch2_checksum(c, p.crc.csum_type, nonce, data_buf, bytes);

	if (fsck_err_on(bch2_crc_cmp(csum, p.crc.csum),

			trans, dup_backpointer_to_bad_csum_extent,

fs/bcachefs/bcachefs_format.h

+3 −3
Original line number Diff line number Diff line
@@ -217,7 +217,7 @@ struct bkey { 
#if __BYTE_ORDER__ == __ORDER_LITTLE_ENDIAN__

	__u8		pad[1];



	struct bversion	version;

	struct bversion	bversion;

	__u32		size;		/* extent size, in sectors */

	struct bpos	p;

#elif __BYTE_ORDER__ == __ORDER_BIG_ENDIAN__
@@ -328,8 +328,8 @@ enum bch_bkey_fields { 
		bkey_format_field(OFFSET,	p.offset),		\

		bkey_format_field(SNAPSHOT,	p.snapshot),		\

		bkey_format_field(SIZE,		size),			\

		bkey_format_field(VERSION_HI,	version.hi),		\

		bkey_format_field(VERSION_LO,	version.lo),		\

		bkey_format_field(VERSION_HI,	bversion.hi),		\

		bkey_format_field(VERSION_LO,	bversion.lo),		\

	},								\

})

fs/bcachefs/bkey.h

+2 −2
Original line number Diff line number Diff line
@@ -554,8 +554,8 @@ static inline void bch2_bkey_pack_test(void) {} 
	x(BKEY_FIELD_OFFSET,		p.offset)			\

	x(BKEY_FIELD_SNAPSHOT,		p.snapshot)			\

	x(BKEY_FIELD_SIZE,		size)				\

	x(BKEY_FIELD_VERSION_HI,	version.hi)			\

	x(BKEY_FIELD_VERSION_LO,	version.lo)

	x(BKEY_FIELD_VERSION_HI,	bversion.hi)			\

	x(BKEY_FIELD_VERSION_LO,	bversion.lo)



struct bkey_format_state {

	u64 field_min[BKEY_NR_FIELDS];

fs/bcachefs/bkey_methods.c

+1 −1
Original line number Diff line number Diff line
@@ -289,7 +289,7 @@ void bch2_bkey_to_text(struct printbuf *out, const struct bkey *k) 


		bch2_bpos_to_text(out, k->p);



		prt_printf(out, " len %u ver %llu", k->size, k->version.lo);

		prt_printf(out, " len %u ver %llu", k->size, k->bversion.lo);

	} else {

		prt_printf(out, "(null)");

	}

fs/bcachefs/bkey_methods.h

+1 −1
Original line number Diff line number Diff line
@@ -70,7 +70,7 @@ bool bch2_bkey_normalize(struct bch_fs *, struct bkey_s); 
static inline bool bch2_bkey_maybe_mergable(const struct bkey *l, const struct bkey *r)

{

	return l->type == r->type &&

		!bversion_cmp(l->version, r->version) &&

		!bversion_cmp(l->bversion, r->bversion) &&

		bpos_eq(l->p, bkey_start_pos(r));

}