Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'block-6.10-20240607' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
- Fix for null_blk block size validation (Andreas)
- NVMe pull request via Keith:
- Use reserved tags for special fabrics operations (Chunguang)
- Persistent Reservation status masking fix (Weiwen)
* tag 'block-6.10-20240607' of git://git.kernel.dk/linux:
null_blk: fix validation of block size
nvme: fix nvme_pr_* status code parsing
nvme-fabrics: use reserved tag for reg read/write command
+6
-6
+2
-2
drivers/block/null_blk/main.c
+2
-2
drivers/block/null_blk/main.c
···
1824
1824
dev->queue_mode = NULL_Q_MQ;
1825
1825
}
1826
1826
1827
-
dev->blocksize = round_down(dev->blocksize, 512);
1828
-
dev->blocksize = clamp_t(unsigned int, dev->blocksize, 512, 4096);
1827
+
if (blk_validate_block_size(dev->blocksize))
1828
+
return -EINVAL;
1829
1829
1830
1830
if (dev->use_per_node_hctx) {
1831
1831
if (dev->submit_queues != nr_online_nodes)
+3
-3
drivers/nvme/host/fabrics.c
+3
-3
drivers/nvme/host/fabrics.c
···
180
180
cmd.prop_get.offset = cpu_to_le32(off);
181
181
182
182
ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,
183
-
NVME_QID_ANY, 0);
183
+
NVME_QID_ANY, NVME_SUBMIT_RESERVED);
184
184
185
185
if (ret >= 0)
186
186
*val = le64_to_cpu(res.u64);
···
226
226
cmd.prop_get.offset = cpu_to_le32(off);
227
227
228
228
ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, &res, NULL, 0,
229
-
NVME_QID_ANY, 0);
229
+
NVME_QID_ANY, NVME_SUBMIT_RESERVED);
230
230
231
231
if (ret >= 0)
232
232
*val = le64_to_cpu(res.u64);
···
271
271
cmd.prop_set.value = cpu_to_le64(val);
272
272
273
273
ret = __nvme_submit_sync_cmd(ctrl->fabrics_q, &cmd, NULL, NULL, 0,
274
-
NVME_QID_ANY, 0);
274
+
NVME_QID_ANY, NVME_SUBMIT_RESERVED);
275
275
if (unlikely(ret))
276
276
dev_err(ctrl->device,
277
277
"Property Set error: %d, offset %#x\n",