Linux kernel mirror (for testing)
git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel
os
linux
Merge tag 'block-6.6-2023-10-06' of git://git.kernel.dk/linux
Pull block fixes from Jens Axboe:
"Just two minor fixes, for nbd and md"
* tag 'block-6.6-2023-10-06' of git://git.kernel.dk/linux:
nbd: don't call blk_mark_disk_dead nbd_clear_sock_ioctl
md/raid5: release batch_last before waiting for another stripe_head
+9
-1
+2
-1
drivers/block/nbd.c
+2
-1
drivers/block/nbd.c
···
1436
1436
1437
1437
static void nbd_clear_sock_ioctl(struct nbd_device *nbd)
1438
1438
{
1439
-
blk_mark_disk_dead(nbd->disk);
1440
1439
nbd_clear_sock(nbd);
1440
+
disk_force_media_change(nbd->disk);
1441
+
nbd_bdev_reset(nbd);
1441
1442
if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF,
1442
1443
&nbd->config->runtime_flags))
1443
1444
nbd_config_put(nbd);
+7
drivers/md/raid5.c
+7
drivers/md/raid5.c
···
854
854
855
855
set_bit(R5_INACTIVE_BLOCKED, &conf->cache_state);
856
856
r5l_wake_reclaim(conf->log, 0);
857
+
858
+
/* release batch_last before wait to avoid risk of deadlock */
859
+
if (ctx && ctx->batch_last) {
860
+
raid5_release_stripe(ctx->batch_last);
861
+
ctx->batch_last = NULL;
862
+
}
863
+
857
864
wait_event_lock_irq(conf->wait_for_stripe,
858
865
is_inactive_blocked(conf, hash),
859
866
*(conf->hash_locks + hash));