4e5f7cbf78
- drbd: fix build error against kernel v6.1.1 (bsc#1206791)
* update bsc-1201335_06-bdi.patch commit log (no code change)
+ bsc-1201335_06-bdi.patch
* update bsc-1202600_02-dax-introduce-DAX_RECOVERY_WRITE-dax-access-mode.patch (no code change)
+ bsc-1202600_02-dax-introduce-DAX_RECOVERY_WRITE-dax-access-mode.patch
* using upstream patch to replace exist patch
- bsc-1204596_02-drbd-stop-using-bdevname-in-drbd_report_io_error.patch
+ bsc-1204596_02-drbd-remove-usage-of-bdevname.patch
* add new patches
+ bsc-1206791-01-drbd-add-comments-explaining-removal-of-bdi-congesti.patch
+ bsc-1206791-02-drbd-fix-static-analysis-warnings.patch
+ bsc-1206791-03-drbd-fix-warning-about-initializing-multiple-struct-.patch
+ bsc-1206791-04-blk_queue_split__no_present.patch
+ bsc-1206791-05-prandom_u32_max.patch
+ bsc-1206791-06-write_zeroes__no_capable.patch
+ bsc-1206791-07-drbd-fix-use-after-free-bugs-in-get_initial_state.patch
+ bsc-1206791-08-lib-lru_cache-Fixed-array-overflow-caused-by-incorre.patch
+ bsc-1206791-09-pmem-use-fs_dax_get_by_bdev-instead-of-dax_get_by_ho.patch
OBS-URL: https://build.opensuse.org/request/show/1056192
OBS-URL: https://build.opensuse.org/package/show/network:ha-clustering:Factory/drbd?expand=0&rev=142
39 lines
1.2 KiB
Diff
39 lines
1.2 KiB
Diff
From d9a0a8d2c02f7a8da542230bebf0045f24f0fc74 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Christoph=20B=C3=B6hmwalder?=
|
|
<christoph.boehmwalder@linbit.com>
|
|
Date: Thu, 13 Oct 2022 15:00:46 +0200
|
|
Subject: [PATCH] drbd: remove usage of bdevname
|
|
|
|
See upstream commit 1b70ccecaed4 (drbd: stop using bdevname in
|
|
drbd_report_io_error)
|
|
---
|
|
drbd/drbd_req.c | 6 ++----
|
|
1 file changed, 2 insertions(+), 4 deletions(-)
|
|
|
|
diff --git a/drbd/drbd_req.c b/drbd/drbd_req.c
|
|
index a6b9723fde42..1ee50f1c1720 100644
|
|
--- a/drbd/drbd_req.c
|
|
+++ b/drbd/drbd_req.c
|
|
@@ -868,16 +868,14 @@ static void mod_rq_state(struct drbd_request *req, struct bio_and_error *m,
|
|
|
|
static void drbd_report_io_error(struct drbd_device *device, struct drbd_request *req)
|
|
{
|
|
- char b[BDEVNAME_SIZE];
|
|
-
|
|
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.
|
|
--
|
|
2.26.2
|
|
|