Commit ad740780 authored by Christoph Hellwig's avatar Christoph Hellwig Committed by Jens Axboe
Browse files

block: remove handle_bad_sector 



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: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarChaitanya Kulkarni <kch@nvidia.com>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20220304180105.409765-3-hch@lst.de


Signed-off-by: default avatarJens Axboe <axboe@kernel.dk>
parent 57e95e46

block/blk-core.c

+5 −12
Original line number Diff line number Diff line
@@ -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;