]> www.infradead.org Git - users/hch/misc.git/commitdiff
block: remove handle_bad_sector
authorChristoph Hellwig <hch@lst.de>
Fri, 4 Mar 2022 18:00:57 +0000 (19:00 +0100)
committerJens Axboe <axboe@kernel.dk>
Mon, 7 Mar 2022 13:42:33 +0000 (06:42 -0700)
Use the %pg format specifier instead of the stack hungry bdevname
function, and remove handle_bad_sector given that it is not pointless.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Chaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220304180105.409765-3-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
block/blk-core.c

index 34e1b7fdb7c89ce159b618c934732ae68b587cff..4d858fc08f8ba787c5c2efa73bf5d2156a33549d 100644 (file)
@@ -540,17 +540,6 @@ bool blk_get_queue(struct request_queue *q)
 }
 EXPORT_SYMBOL(blk_get_queue);
 
-static void handle_bad_sector(struct bio *bio, sector_t maxsector)
-{
-       char b[BDEVNAME_SIZE];
-
-       pr_info_ratelimited("%s: attempt to access beyond end of device\n"
-                           "%s: rw=%d, want=%llu, limit=%llu\n",
-                           current->comm,
-                           bio_devname(bio, b), bio->bi_opf,
-                           bio_end_sector(bio), maxsector);
-}
-
 #ifdef CONFIG_FAIL_MAKE_REQUEST
 
 static DECLARE_FAULT_ATTR(fail_make_request);
@@ -612,7 +601,11 @@ static inline int bio_check_eod(struct bio *bio)
        if (nr_sectors && maxsector &&
            (nr_sectors > maxsector ||
             bio->bi_iter.bi_sector > maxsector - nr_sectors)) {
-               handle_bad_sector(bio, maxsector);
+               pr_info_ratelimited("%s: attempt to access beyond end of device\n"
+                                   "%pg: rw=%d, want=%llu, limit=%llu\n",
+                                   current->comm,
+                                   bio->bi_bdev, bio->bi_opf,
+                                   bio_end_sector(bio), maxsector);
                return -EIO;
        }
        return 0;