Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 257a4b42 authored by Dan Williams's avatar Dan Williams Committed by NeilBrown
Browse files

md/raid5: STRIPE_ACTIVE has lock semantics, add barriers 



All updates that occur under STRIPE_ACTIVE should be globally visible
when STRIPE_ACTIVE clears.  test_and_set_bit() implies a barrier, but
clear_bit() does not.

This is suitable for 3.1-stable.

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarNeilBrown <neilb@suse.de>
Cc: stable@kernel.org
parent 9a3f530f

drivers/md/raid5.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -3110,7 +3110,7 @@ static void handle_stripe(struct stripe_head *sh) 
	struct r5dev *pdev, *qdev;

	struct r5dev *pdev, *qdev;





	clear_bit(STRIPE_HANDLE, &sh->state);

	clear_bit(STRIPE_HANDLE, &sh->state);

	if (test_and_set_bit(STRIPE_ACTIVE, &sh->state)) {

	if (test_and_set_bit_lock(STRIPE_ACTIVE, &sh->state)) {

		/* already being handled, ensure it gets handled

		/* already being handled, ensure it gets handled

		 * again when current action finishes */

		 * again when current action finishes */

		set_bit(STRIPE_HANDLE, &sh->state);

		set_bit(STRIPE_HANDLE, &sh->state);
@@ -3375,7 +3375,7 @@ finish: 




	return_io(s.return_bi);

	return_io(s.return_bi);





	clear_bit(STRIPE_ACTIVE, &sh->state);

	clear_bit_unlock(STRIPE_ACTIVE, &sh->state);

}

}





static void raid5_activate_delayed(struct r5conf *conf)

static void raid5_activate_delayed(struct r5conf *conf)