Commit e680a14a authored by Jens Axboe's avatar Jens Axboe
Browse files

Merge tag 'md-fixes-20231003' of... 

Merge tag 'md-fixes-20231003' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md into block-6.6

Pull MD fix from Song.

* tag 'md-fixes-20231003' of https://git.kernel.org/pub/scm/linux/kernel/git/song/md:
  md/raid5: release batch_last before waiting for another stripe_head
parents a578a253 2fd7b0f6

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));