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

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
parents a88c3869 07a1141f

drivers/block/nbd.c

+2 −1
Original line number Diff line number Diff line
@@ -1436,8 +1436,9 @@ static int nbd_start_device_ioctl(struct nbd_device *nbd) 


static void nbd_clear_sock_ioctl(struct nbd_device *nbd)

{

	blk_mark_disk_dead(nbd->disk);

	nbd_clear_sock(nbd);

	disk_force_media_change(nbd->disk);

	nbd_bdev_reset(nbd);

	if (test_and_clear_bit(NBD_RT_HAS_CONFIG_REF,

			       &nbd->config->runtime_flags))

		nbd_config_put(nbd);

drivers/md/raid5.c

+7 −0
Original line number Diff line number Diff line
@@ -854,6 +854,13 @@ struct stripe_head *raid5_get_active_stripe(struct r5conf *conf, 


		set_bit(R5_INACTIVE_BLOCKED, &conf->cache_state);

		r5l_wake_reclaim(conf->log, 0);



		/* release batch_last before wait to avoid risk of deadlock */

		if (ctx && ctx->batch_last) {

			raid5_release_stripe(ctx->batch_last);

			ctx->batch_last = NULL;

		}



		wait_event_lock_irq(conf->wait_for_stripe,

				    is_inactive_blocked(conf, hash),

				    *(conf->hash_locks + hash));