Message ID | 20220713055317.1888500-4-hch@lst.de (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | [1/9] block: stop using bdevname in bdev_write_inode | expand |
Am 13.07.22 um 07:53 schrieb Christoph Hellwig: > Just use the %pg format specifier instead. > > Signed-off-by: Christoph Hellwig <hch@lst.de> > --- > drivers/block/drbd/drbd_req.c | 6 ++---- > 1 file changed, 2 insertions(+), 4 deletions(-) > > diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c > index e64bcfba30ef3..6d8dd14458c69 100644 > --- a/drivers/block/drbd/drbd_req.c > +++ b/drivers/block/drbd/drbd_req.c > @@ -523,16 +523,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 (!__ratelimit(&drbd_ratelimit_state)) > 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->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. For the drbd part: Reviewed-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com> Thanks.
diff --git a/drivers/block/drbd/drbd_req.c b/drivers/block/drbd/drbd_req.c index e64bcfba30ef3..6d8dd14458c69 100644 --- a/drivers/block/drbd/drbd_req.c +++ b/drivers/block/drbd/drbd_req.c @@ -523,16 +523,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 (!__ratelimit(&drbd_ratelimit_state)) 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->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.
Just use the %pg format specifier instead. Signed-off-by: Christoph Hellwig <hch@lst.de> --- drivers/block/drbd/drbd_req.c | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-)