diff options
| author |   Coly Li <colyli@suse.de> | 2019-04-25 00:48:32 +0800 |
|---|---|---|
| committer |   Jens Axboe <axboe@kernel.dk> | 2019-04-24 10:56:27 -0600 |
| commit | 14215ee01f6377c81c25c2cecda729e8811d2826 (patch) | |
| tree | 01cf8b314ad3e8d1897ff8aa21201441d372810c /drivers/md | |
| parent | bcache: fix a race between cache register and cacheset unregister (diff) | |
| download | linux-dev-14215ee01f6377c81c25c2cecda729e8811d2826.tar.xz linux-dev-14215ee01f6377c81c25c2cecda729e8811d2826.zip | |
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>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/bcache/journal.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/md/bcache/journal.c b/drivers/md/bcache/journal.c index b2fd412715b1..6e18057d1d82 100644 --- a/drivers/md/bcache/journal.c +++ b/drivers/md/bcache/journal.c @@ -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 } |