Commit 3a654ee5 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.17-20250925' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux 

Pull block fixes from Jens Axboe:
 "A regression fix for this series where an attempt to silence an EOD
  error got messed up a bit, and then a change of git trees for the
  block and io_uring trees.

  Switching the git trees to kernel.org now, as I've just about had it
  trying to battle AI bots that bring the box to its knees, continually.
  At least I don't have to maintain the kernel.org side"

* tag 'block-6.17-20250925' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  MAINTAINERS: update io_uring and block tree git trees
  block: fix EOD return for device with nr_sectors == 0
parents 3170244b 285213a6

MAINTAINERS

+3 −3
Original line number Diff line number Diff line
@@ -6221,7 +6221,7 @@ M: Josef Bacik <josef@toxicpanda.com> 
M:	Jens Axboe <axboe@kernel.dk>

L:	cgroups@vger.kernel.org

L:	linux-block@vger.kernel.org

T:	git git://git.kernel.dk/linux-block

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git

F:	Documentation/admin-guide/cgroup-v1/blkio-controller.rst

F:	block/bfq-cgroup.c

F:	block/blk-cgroup.c
@@ -12876,8 +12876,8 @@ IO_URING 
M:	Jens Axboe <axboe@kernel.dk>

L:	io-uring@vger.kernel.org

S:	Maintained

T:	git git://git.kernel.dk/linux-block

T:	git git://git.kernel.dk/liburing

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git

T:	git git://git.kernel.org/pub/scm/linux/kernel/git/axboe/liburing.git

F:	include/linux/io_uring/

F:	include/linux/io_uring.h

F:	include/linux/io_uring_types.h

block/blk-core.c

+3 −1
Original line number Diff line number Diff line
@@ -557,9 +557,11 @@ static inline int bio_check_eod(struct bio *bio) 
	sector_t maxsector = bdev_nr_sectors(bio->bi_bdev);

	unsigned int nr_sectors = bio_sectors(bio);



	if (nr_sectors && maxsector &&

	if (nr_sectors &&

	    (nr_sectors > maxsector ||

	     bio->bi_iter.bi_sector > maxsector - nr_sectors)) {

		if (!maxsector)

			return -EIO;

		pr_info_ratelimited("%s: attempt to access beyond end of device\n"

				    "%pg: rw=%d, sector=%llu, nr_sectors = %u limit=%llu\n",

				    current->comm, bio->bi_bdev, bio->bi_opf,