Skip to content

Commit 3f0e9c8

Browse files
committed
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
2 parents 4079a38 + 1ddb815 commit 3f0e9c8

2 files changed

Lines changed: 2 additions & 3 deletions

File tree

drivers/block/rnbd/rnbd-clt.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ struct rnbd_clt_dev {
112112
struct rnbd_queue *hw_queues;
113113
u32 device_id;
114114
/* local Idr index - used to track minor number allocations. */
115-
u32 clt_device_id;
115+
int clt_device_id;
116116
struct mutex lock;
117117
enum rnbd_clt_dev_state dev_state;
118118
refcount_t refcount;

drivers/block/ublk_drv.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1607,8 +1607,7 @@ static bool ublk_check_and_reset_active_ref(struct ublk_device *ub)
16071607
{
16081608
int i, j;
16091609

1610-
if (!(ub->dev_info.flags & (UBLK_F_SUPPORT_ZERO_COPY |
1611-
UBLK_F_AUTO_BUF_REG)))
1610+
if (!ublk_dev_need_req_ref(ub))
16121611
return false;
16131612

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

0 commit comments

Comments
 (0)