[PATCH] md: do_release_stripe(): No need to call md_wakeup_thread() twice

[PATCH] md: do_release_stripe(): No need to call md_wakeup_thread() twice

[Jes.Sorensen]

From: Jes Sorensen <Jes.Sorensen@redhat.com>

67f455486d2ea20b2d94d6adf5b9b783d079e321 introduced a call to
md_wakeup_thread() when adding to the delayed_list. However the md
thread is woken up unconditionally just below.

Remove the unnecessary wakeup call.

Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
---
 drivers/md/raid5.c | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
index c1b0d52..41494d9 100644
--- a/drivers/md/raid5.c
+++ b/drivers/md/raid5.c
@@ -296,12 +296,9 @@ static void do_release_stripe(struct r5conf *conf, struct stripe_head *sh,
 	BUG_ON(atomic_read(&conf->active_stripes)==0);
 	if (test_bit(STRIPE_HANDLE, &sh->state)) {
 		if (test_bit(STRIPE_DELAYED, &sh->state) &&
-		    !test_bit(STRIPE_PREREAD_ACTIVE, &sh->state)) {
+		    !test_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
 			list_add_tail(&sh->lru, &conf->delayed_list);
-			if (atomic_read(&conf->preread_active_stripes)
-			    < IO_THRESHOLD)
-				md_wakeup_thread(conf->mddev->thread);
-		} else if (test_bit(STRIPE_BIT_DELAY, &sh->state) &&
+		else if (test_bit(STRIPE_BIT_DELAY, &sh->state) &&
 			   sh->bm_seq - conf->seq_write > 0)
 			list_add_tail(&sh->lru, &conf->bitmap_list);
 		else {
-- 
2.1.0

Re: [PATCH] md: do_release_stripe(): No need to call md_wakeup_thread() twice

[NeilBrown]

[-- Attachment #1: Type: text/plain, Size: 1455 bytes --]

On Thu, 29 Jan 2015 12:38:29 -0500 Jes.Sorensen@redhat.com wrote:

> From: Jes Sorensen <Jes.Sorensen@redhat.com>
> 
> 67f455486d2ea20b2d94d6adf5b9b783d079e321 introduced a call to
> md_wakeup_thread() when adding to the delayed_list. However the md
> thread is woken up unconditionally just below.
> 
> Remove the unnecessary wakeup call.
> 
> Signed-off-by: Jes Sorensen <Jes.Sorensen@redhat.com>
> ---
>  drivers/md/raid5.c | 7 ++-----
>  1 file changed, 2 insertions(+), 5 deletions(-)
> 
> diff --git a/drivers/md/raid5.c b/drivers/md/raid5.c
> index c1b0d52..41494d9 100644
> --- a/drivers/md/raid5.c
> +++ b/drivers/md/raid5.c
> @@ -296,12 +296,9 @@ static void do_release_stripe(struct r5conf *conf, struct stripe_head *sh,
>  	BUG_ON(atomic_read(&conf->active_stripes)==0);
>  	if (test_bit(STRIPE_HANDLE, &sh->state)) {
>  		if (test_bit(STRIPE_DELAYED, &sh->state) &&
> -		    !test_bit(STRIPE_PREREAD_ACTIVE, &sh->state)) {
> +		    !test_bit(STRIPE_PREREAD_ACTIVE, &sh->state))
>  			list_add_tail(&sh->lru, &conf->delayed_list);
> -			if (atomic_read(&conf->preread_active_stripes)
> -			    < IO_THRESHOLD)
> -				md_wakeup_thread(conf->mddev->thread);
> -		} else if (test_bit(STRIPE_BIT_DELAY, &sh->state) &&
> +		else if (test_bit(STRIPE_BIT_DELAY, &sh->state) &&
>  			   sh->bm_seq - conf->seq_write > 0)
>  			list_add_tail(&sh->lru, &conf->bitmap_list);
>  		else {

Applied, thanks.

NeilBrown

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 811 bytes --]