md: do_release_stripe(): No need to call md_wakeup_thread() twice
authorJes Sorensen <Jes.Sorensen@redhat.com>
Thu, 29 Jan 2015 17:38:29 +0000 (12:38 -0500)
committerNeilBrown <neilb@suse.de>
Tue, 3 Feb 2015 21:35:51 +0000 (08:35 +1100)
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>
Signed-off-by: NeilBrown <neilb@suse.de>
drivers/md/raid5.c

index b98765f6f77fd9f1e11ecdcd8809928e7b821716..274db1834d43ddc86320c986fda53bbcff341503 100644 (file)
@@ -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 {