|
Coly Li |
193f67 |
From 33ec5dfe8f42aaf0163a16e2b450ab06f3a7f1f3 Mon Sep 17 00:00:00 2001
|
|
Coly Li |
193f67 |
From: Coly Li <colyli@suse.de>
|
|
Coly Li |
193f67 |
Date: Sun, 11 Apr 2021 21:43:16 +0800
|
|
Coly Li |
193f67 |
Subject: [PATCH] bcache: fix a regression of code compiling failure in debug.c
|
|
Coly Li |
193f67 |
Git-commit: 33ec5dfe8f42aaf0163a16e2b450ab06f3a7f1f3
|
|
Coly Li |
193f67 |
Patch-mainline: v5.13-rc1
|
|
Coly Li |
193f67 |
References: bsc#1187357
|
|
Coly Li |
193f67 |
|
|
Coly Li |
193f67 |
The patch "bcache: remove PTR_CACHE" introduces a compiling failure in
|
|
Coly Li |
193f67 |
debug.c with following error message,
|
|
Coly Li |
193f67 |
In file included from drivers/md/bcache/bcache.h:182:0,
|
|
Coly Li |
193f67 |
from drivers/md/bcache/debug.c:9:
|
|
Coly Li |
193f67 |
drivers/md/bcache/debug.c: In function 'bch_btree_verify':
|
|
Coly Li |
193f67 |
drivers/md/bcache/debug.c:53:19: error: 'c' undeclared (first use in
|
|
Coly Li |
193f67 |
this function)
|
|
Coly Li |
193f67 |
bio_set_dev(bio, c->cache->bdev);
|
|
Coly Li |
193f67 |
^
|
|
Coly Li |
193f67 |
This patch fixes the regression by replacing c->cache->bdev by b->c->
|
|
Coly Li |
193f67 |
cache->bdev.
|
|
Coly Li |
193f67 |
|
|
Coly Li |
193f67 |
Signed-off-by: Coly Li <colyli@suse.de>
|
|
Coly Li |
193f67 |
Cc: Christoph Hellwig <hch@lst.de>
|
|
Coly Li |
193f67 |
Link: https://lore.kernel.org/r/20210411134316.80274-8-colyli@suse.de
|
|
Coly Li |
193f67 |
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
|
Coly Li |
193f67 |
|
|
Coly Li |
193f67 |
---
|
|
Coly Li |
193f67 |
drivers/md/bcache/debug.c | 2 +-
|
|
Coly Li |
193f67 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
Coly Li |
193f67 |
|
|
Coly Li |
193f67 |
diff --git a/drivers/md/bcache/debug.c b/drivers/md/bcache/debug.c
|
|
Coly Li |
193f67 |
index 589a052efeb1..116edda845c3 100644
|
|
Coly Li |
193f67 |
--- a/drivers/md/bcache/debug.c
|
|
Coly Li |
193f67 |
+++ b/drivers/md/bcache/debug.c
|
|
Coly Li |
193f67 |
@@ -50,7 +50,7 @@ void bch_btree_verify(struct btree *b)
|
|
Coly Li |
193f67 |
v->keys.ops = b->keys.ops;
|
|
Coly Li |
193f67 |
|
|
Coly Li |
193f67 |
bio = bch_bbio_alloc(b->c);
|
|
Coly Li |
193f67 |
- bio_set_dev(bio, c->cache->bdev);
|
|
Coly Li |
193f67 |
+ bio_set_dev(bio, b->c->cache->bdev);
|
|
Coly Li |
193f67 |
bio->bi_iter.bi_sector = PTR_OFFSET(&b->key, 0);
|
|
Coly Li |
193f67 |
bio->bi_iter.bi_size = KEY_SIZE(&v->key) << 9;
|
|
Coly Li |
193f67 |
bio->bi_opf = REQ_OP_READ | REQ_META;
|
|
Coly Li |
193f67 |
--
|
|
Coly Li |
193f67 |
2.26.2
|
|
Coly Li |
193f67 |
|