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

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

Pull block fixes from Jens Axboe:

 - Fix for a signedness issue introduced in this kernel release for rnbd

 - Fix up user copy references for ublk when the server exits

* tag 'block-6.19-20251226' of git://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux:
  block: rnbd-clt: Fix signedness bug in init_dev()
  ublk: clean up user copy references on ublk server exit
parents 4079a386 1ddb815f

drivers/block/rnbd/rnbd-clt.h

+1 −1
Original line number Diff line number Diff line
@@ -112,7 +112,7 @@ struct rnbd_clt_dev { 
	struct rnbd_queue	*hw_queues;

	u32			device_id;

	/* local Idr index - used to track minor number allocations. */

	u32			clt_device_id;

	int			clt_device_id;

	struct mutex		lock;

	enum rnbd_clt_dev_state	dev_state;

	refcount_t		refcount;

drivers/block/ublk_drv.c

+1 −2
Original line number Diff line number Diff line
@@ -1607,8 +1607,7 @@ static bool ublk_check_and_reset_active_ref(struct ublk_device *ub) 
{

	int i, j;



	if (!(ub->dev_info.flags & (UBLK_F_SUPPORT_ZERO_COPY |

					UBLK_F_AUTO_BUF_REG)))

	if (!ublk_dev_need_req_ref(ub))

		return false;



	for (i = 0; i < ub->dev_info.nr_hw_queues; i++) {