fb29c7bf26
- drbd: build error against kernel v6.0.2 (bsc#1204596)
- add patch:
+ bsc-1204596_01-block-remove-blk_cleanup_disk.patch
+ bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch
OBS-URL: https://build.opensuse.org/request/show/1030530
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=140
37 lines
1.3 KiB
Diff
37 lines
1.3 KiB
Diff
From 1b70ccecaed4c3c50239e8409156fb447f965554 Mon Sep 17 00:00:00 2001
|
|
From: Christoph Hellwig <hch@lst.de>
|
|
Date: Wed, 13 Jul 2022 07:53:11 +0200
|
|
Subject: [PATCH] drbd: stop using bdevname in drbd_report_io_error
|
|
MIME-Version: 1.0
|
|
Content-Type: text/plain; charset=UTF-8
|
|
Content-Transfer-Encoding: 8bit
|
|
|
|
Just use the %pg format specifier instead.
|
|
|
|
Signed-off-by: Christoph Hellwig <hch@lst.de>
|
|
Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
|
|
Reviewed-by: Jan Kara <jack@suse.cz>
|
|
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
|
|
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
|
|
Link: https://lore.kernel.org/r/20220713055317.1888500-4-hch@lst.de
|
|
Signed-off-by: Jens Axboe <axboe@kernel.dk>
|
|
---
|
|
|
|
diff -Nupr a/drbd/drbd_req.c b/drbd/drbd_req.c
|
|
--- a/drbd/drbd_req.c 2022-10-22 19:32:24.033651322 +0800
|
|
+++ b/drbd/drbd_req.c 2022-10-22 19:33:01.433605547 +0800
|
|
@@ -745,11 +745,11 @@ static void drbd_report_io_error(struct
|
|
if (!drbd_ratelimit())
|
|
return;
|
|
|
|
- drbd_warn(device, "local %s IO error sector %llu+%u on %s\n",
|
|
+ drbd_warn(device, "local %s IO error sector %llu+%u on %pg\n",
|
|
(req->local_rq_state & RQ_WRITE) ? "WRITE" : "READ",
|
|
(unsigned long long)req->i.sector,
|
|
req->i.size >> 9,
|
|
- bdevname(device->ldev->backing_bdev, b));
|
|
+ device->ldev->backing_bdev);
|
|
}
|
|
|
|
/* Helper for HANDED_OVER_TO_NETWORK.
|