Commit cc9f0629 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'block-6.15-20250509' of git://git.kernel.dk/linux 

Pull block fixes from Jens Axboe:

 - Fix for a regression in this series for loop and read/write iterator
   handling

 - zone append block update tweak

 - remove a broken IO priority test

 - NVMe pull request via Christoph:
      - unblock ctrl state transition for firmware update (Daniel
        Wagner)

* tag 'block-6.15-20250509' of git://git.kernel.dk/linux:
  block: remove test of incorrect io priority level
  nvme: unblock ctrl state transition for firmware update
  block: only update request sector if needed
  loop: Add sanity check for read/write_iter
parents 7380c60b dd90905d

block/blk.h

+2 −1
Original line number Diff line number Diff line
@@ -480,7 +480,8 @@ static inline void blk_zone_update_request_bio(struct request *rq, 
	 * the original BIO sector so that blk_zone_write_plug_bio_endio() can

	 * lookup the zone write plug.

	 */

	if (req_op(rq) == REQ_OP_ZONE_APPEND || bio_zone_write_plugging(bio))

	if (req_op(rq) == REQ_OP_ZONE_APPEND ||

	    bio_flagged(bio, BIO_EMULATES_ZONE_APPEND))

		bio->bi_iter.bi_sector = rq->__sector;

}

void blk_zone_write_plug_bio_endio(struct bio *bio);

block/ioprio.c

+1 −5
Original line number Diff line number Diff line
@@ -46,12 +46,8 @@ int ioprio_check_cap(int ioprio) 
			 */

			if (!capable(CAP_SYS_ADMIN) && !capable(CAP_SYS_NICE))

				return -EPERM;

			fallthrough;

			/* rt has prio field too */

		case IOPRIO_CLASS_BE:

			if (level >= IOPRIO_NR_LEVELS)

				return -EINVAL;

			break;

		case IOPRIO_CLASS_BE:

		case IOPRIO_CLASS_IDLE:

			break;

		case IOPRIO_CLASS_NONE:

drivers/block/loop.c

+23 −0
Original line number Diff line number Diff line
@@ -505,6 +505,17 @@ static void loop_assign_backing_file(struct loop_device *lo, struct file *file) 
	lo->lo_min_dio_size = loop_query_min_dio_size(lo);

}



static int loop_check_backing_file(struct file *file)

{

	if (!file->f_op->read_iter)

		return -EINVAL;



	if ((file->f_mode & FMODE_WRITE) && !file->f_op->write_iter)

		return -EINVAL;



	return 0;

}



/*

 * loop_change_fd switched the backing store of a loopback device to

 * a new file. This is useful for operating system installers to free up
@@ -526,6 +537,10 @@ static int loop_change_fd(struct loop_device *lo, struct block_device *bdev, 
	if (!file)

		return -EBADF;



	error = loop_check_backing_file(file);

	if (error)

		return error;



	/* suppress uevents while reconfiguring the device */

	dev_set_uevent_suppress(disk_to_dev(lo->lo_disk), 1);
@@ -963,6 +978,14 @@ static int loop_configure(struct loop_device *lo, blk_mode_t mode, 


	if (!file)

		return -EBADF;



	if ((mode & BLK_OPEN_WRITE) && !file->f_op->write_iter)

		return -EINVAL;



	error = loop_check_backing_file(file);

	if (error)

		return error;



	is_loop = is_loop_device(file);



	/* This is safe, since we have a reference from open(). */

drivers/nvme/host/core.c

+2 −1
Original line number Diff line number Diff line
@@ -4493,7 +4493,8 @@ static void nvme_fw_act_work(struct work_struct *work) 
		msleep(100);

	}



	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))

	if (!nvme_change_ctrl_state(ctrl, NVME_CTRL_CONNECTING) ||

	    !nvme_change_ctrl_state(ctrl, NVME_CTRL_LIVE))

		return;



	nvme_unquiesce_io_queues(ctrl);