openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

bcache: move definition of 'int ret' out of macro read_bucket() 

'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>
This commit is contained in:
Coly Li 2019-04-25 00:48:32 +08:00 committed by Jens Axboe
parent a4b732a248
commit 14215ee01f
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/md/bcache/journal.c
View File

@ -147,7 +147,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)
{ {
#define read_bucket(b) \ #define read_bucket(b) \
({ \ ({ \
int ret = journal_read_bucket(ca, list, b); \ ret = journal_read_bucket(ca, list, b); \
__set_bit(b, bitmap); \ __set_bit(b, bitmap); \
if (ret < 0) \ if (ret < 0) \
return ret; \ return ret; \
@ -156,6 +156,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)
struct cache *ca; struct cache *ca;
unsigned int iter; unsigned int iter;
int ret = 0;
for_each_cache(ca, c, iter) { for_each_cache(ca, c, iter) {
struct journal_device *ja = &ca->journal; struct journal_device *ja = &ca->journal;
@ -267,7 +268,7 @@ int bch_journal_read(struct cache_set *c, struct list_head *list)
struct journal_replay, struct journal_replay,
list)->j.seq; list)->j.seq;
return 0; return ret;
#undef read_bucket #undef read_bucket
} }