Commit 1e81f89b authored by Kent Overstreet's avatar Kent Overstreet
Browse files

bcachefs: Fix assorted checkpatch nits 



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

fs/bcachefs/alloc_types.h

+2 −2
Original line number Diff line number Diff line
@@ -105,7 +105,7 @@ struct write_point { 
		struct dev_stripe_state	stripe;



		u64			sectors_allocated;

	} __attribute__((__aligned__(SMP_CACHE_BYTES)));

	} __aligned(SMP_CACHE_BYTES);



	struct {

		struct work_struct	index_update_work;
@@ -116,7 +116,7 @@ struct write_point { 
		enum write_point_state	state;

		u64			last_state_change;

		u64			time[WRITE_POINT_STATE_NR];

	} __attribute__((__aligned__(SMP_CACHE_BYTES)));

	} __aligned(SMP_CACHE_BYTES);

};



struct write_point_specifier {

fs/bcachefs/btree_io.h

+2 −2
Original line number Diff line number Diff line
@@ -143,8 +143,8 @@ enum btree_write_flags { 
	__BTREE_WRITE_ONLY_IF_NEED = BTREE_WRITE_TYPE_BITS,

	__BTREE_WRITE_ALREADY_STARTED,

};

#define BTREE_WRITE_ONLY_IF_NEED	(1U << __BTREE_WRITE_ONLY_IF_NEED )

#define BTREE_WRITE_ALREADY_STARTED	(1U << __BTREE_WRITE_ALREADY_STARTED)

#define BTREE_WRITE_ONLY_IF_NEED	BIT(__BTREE_WRITE_ONLY_IF_NEED)

#define BTREE_WRITE_ALREADY_STARTED	BIT(__BTREE_WRITE_ALREADY_STARTED)



void __bch2_btree_node_write(struct bch_fs *, struct btree *, unsigned);

void bch2_btree_node_write(struct bch_fs *, struct btree *,

fs/bcachefs/btree_iter.c

+4 −4
Original line number Diff line number Diff line
@@ -1008,7 +1008,7 @@ static int bch2_btree_path_traverse_all(struct btree_trans *trans) 
	/*

	 * We used to assert that all paths had been traversed here

	 * (path->uptodate < BTREE_ITER_NEED_TRAVERSE); however, since

	 * path->Should_be_locked is not set yet, we we might have unlocked and

	 * path->should_be_locked is not set yet, we might have unlocked and

	 * then failed to relock a path - that's fine.

	 */

err:

fs/bcachefs/btree_update.h

+2 −2
Original line number Diff line number Diff line
@@ -268,10 +268,10 @@ static inline struct bkey_i *__bch2_bkey_get_mut_noupdate(struct btree_trans *tr 
{

	struct bkey_s_c k = __bch2_bkey_get_iter(trans, iter,

				btree_id, pos, flags|BTREE_ITER_INTENT, type);

	struct bkey_i *ret = unlikely(IS_ERR(k.k))

	struct bkey_i *ret = IS_ERR(k.k)

		? ERR_CAST(k.k)

		: __bch2_bkey_make_mut_noupdate(trans, k, 0, min_bytes);

	if (unlikely(IS_ERR(ret)))

	if (IS_ERR(ret))

		bch2_trans_iter_exit(trans, iter);

	return ret;

}

fs/bcachefs/buckets.c

+1 −0
Original line number Diff line number Diff line
@@ -1924,6 +1924,7 @@ static int __bch2_trans_mark_dev_sb(struct btree_trans *trans, 
int bch2_trans_mark_dev_sb(struct bch_fs *c, struct bch_dev *ca)

{

	int ret = bch2_trans_run(c, __bch2_trans_mark_dev_sb(&trans, ca));



	if (ret)

		bch_err_fn(c, ret);

	return ret;