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

bcachefs: kill btree_path->(alloc_seq|downgrade_seq) 



These were for extra info in tracepoints for debugging a specialized
issue - we do not want to bloat btree_path for this, at least in release
builds.

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

fs/bcachefs/btree_iter.c

+0 −1
Original line number Diff line number Diff line
@@ -1539,7 +1539,6 @@ static inline struct btree_path *btree_path_alloc(struct btree_trans *trans, 
	path->ref		= 0;

	path->intent_ref	= 0;

	path->nodes_locked	= 0;

	path->alloc_seq++;



	btree_path_list_add(trans, pos, path);

	trans->paths_sorted = false;

fs/bcachefs/btree_locking.c

+0 −1
Original line number Diff line number Diff line
@@ -708,7 +708,6 @@ void __bch2_btree_path_downgrade(struct btree_trans *trans, 


	bch2_btree_path_verify_locks(path);



	path->downgrade_seq++;

	trace_path_downgrade(trans, _RET_IP_, path, old_locks_want);

}

fs/bcachefs/btree_types.h

+0 −2
Original line number Diff line number Diff line
@@ -227,8 +227,6 @@ struct btree_path { 
	u8			sorted_idx;

	u8			ref;

	u8			intent_ref;

	u32			alloc_seq;

	u32			downgrade_seq;



	/* btree_iter_copy starts here: */

	struct bpos		pos;

fs/bcachefs/trace.h

+2 −8
Original line number Diff line number Diff line
@@ -1145,8 +1145,6 @@ TRACE_EVENT(trans_restart_upgrade, 
		__field(u8,			level		)

		__field(u32,			path_seq	)

		__field(u32,			node_seq	)

		__field(u32,			path_alloc_seq	)

		__field(u32,			downgrade_seq)

		TRACE_BPOS_entries(pos)

	),
@@ -1159,12 +1157,10 @@ TRACE_EVENT(trans_restart_upgrade, 
		__entry->level			= f->l;

		__entry->path_seq		= path->l[f->l].lock_seq;

		__entry->node_seq		= IS_ERR_OR_NULL(f->b) ? 0 : f->b->c.lock.seq;

		__entry->path_alloc_seq		= path->alloc_seq;

		__entry->downgrade_seq		= path->downgrade_seq;

		TRACE_BPOS_assign(pos, path->pos)

	),



	TP_printk("%s %pS btree %s pos %llu:%llu:%u locks_want %u -> %u level %u path seq %u node seq %u alloc_seq %u downgrade_seq %u",

	TP_printk("%s %pS btree %s pos %llu:%llu:%u locks_want %u -> %u level %u path seq %u node seq %u",

		  __entry->trans_fn,

		  (void *) __entry->caller_ip,

		  bch2_btree_id_str(__entry->btree_id),
@@ -1175,9 +1171,7 @@ TRACE_EVENT(trans_restart_upgrade, 
		  __entry->new_locks_want,

		  __entry->level,

		  __entry->path_seq,

		  __entry->node_seq,

		  __entry->path_alloc_seq,

		  __entry->downgrade_seq)

		  __entry->node_seq)

);



DEFINE_EVENT(transaction_restart_iter,	trans_restart_relock,