bcache: move definition of 'int ret' out of macro read_bucket() (14215ee0) · Commits · 戴 / test

'int ret' is defined as a local variable inside macro read_bucket(). Since this macro is called multiple times, and following patches will use a 'int ret' variable in bch_journal_read(), this patch moves definition of 'int ret' from macro read_bucket() to range of function bch_journal_read(). Signed-off-by:

Coly Li <colyli@suse.de> Reviewed-by:

Hannes Reinecke <hare@suse.com> Signed-off-by:

Jens Axboe <axboe@kernel.dk>

drivers/md/bcache/journal.c

+3 −2

Original line number	Diff line number	Diff line
		@@ -147,7 +147,7 @@ int bch_journal_read(struct cache_set c, struct list_head list)
		{
		#define read_bucket(b) \
		({ \
		int ret = journal_read_bucket(ca, list, b); \
		ret = journal_read_bucket(ca, list, b); \
		__set_bit(b, bitmap); \
		if (ret < 0) \
		return ret; \
		@@ -156,6 +156,7 @@ int bch_journal_read(struct cache_set c, struct list_head list)

		struct cache *ca;
		unsigned int iter;
		int ret = 0;

		for_each_cache(ca, c, iter) {
		struct journal_device *ja = &ca->journal;
		@@ -267,7 +268,7 @@ bsearch:
		struct journal_replay,
		list)->j.seq;

		return 0;
		return ret;
		#undef read_bucket
		}

Admin message