Skip to content

Commit d5c59ee

Browse files
liu-song-6gregkh
authored andcommitted
md/raid5: release/flush io in raid5_do_work()
commit 9c72a18e46ebe0f09484cce8ebf847abdab58498 upstream. In raid5, there are scenarios where some ios are deferred to a later time, and some IO need a flush to complete. To make sure we make progress with these IOs, we need to call the following functions: flush_deferred_bios(conf); r5l_flush_stripe_to_raid(conf->log); Both of these functions are called in raid5d(), but missing in raid5_do_work(). As a result, these functions are not called when multi-threading (group_thread_cnt > 0) is enabled. This patch adds calls to these function to raid5_do_work(). Note for stable branches: r5l_flush_stripe_to_raid(conf->log) is need for 4.4+ flush_deferred_bios(conf) is only needed for 4.11+ Signed-off-by: Song Liu <songliubraving@fb.com> Signed-off-by: Shaohua Li <shli@fb.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent e21d660 commit d5c59ee

1 file changed

Lines changed: 2 additions & 0 deletions

File tree

drivers/md/raid5.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5822,6 +5822,8 @@ static void raid5_do_work(struct work_struct *work)
58225822

58235823
spin_unlock_irq(&conf->device_lock);
58245824

5825+
r5l_flush_stripe_to_raid(conf->log);
5826+
58255827
async_tx_issue_pending_all();
58265828
blk_finish_plug(&plug);
58275829

0 commit comments

Comments
 (0)