diff options
| author |   Christoph Hellwig <hch@lst.de> | 2015-10-05 09:31:08 +0200 |
|---|---|---|
| committer |   NeilBrown <neilb@suse.com> | 2015-11-01 13:48:27 +1100 |
| commit | d8858f4321b744ff02e286165b643e8dc0ef1cf5 (patch) | |
| tree | a9e4ae8b7c4ecc1d3059d1d452e9b7fdef65e499 /drivers/md | |
| parent | raid5-cache: rename flushed_ios to finished_ios (diff) | |
| download | linux-dev-d8858f4321b744ff02e286165b643e8dc0ef1cf5.tar.xz linux-dev-d8858f4321b744ff02e286165b643e8dc0ef1cf5.zip | |
raid5-cache: factor out a helper to run all stripes for an I/O unit
Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: Shaohua Li <shli@fb.com>
Signed-off-by: NeilBrown <neilb@suse.com>
Diffstat (limited to 'drivers/md')
| -rw-r--r-- | drivers/md/raid5-cache.c | 23 |
1 files changed, 13 insertions, 10 deletions
diff --git a/drivers/md/raid5-cache.c b/drivers/md/raid5-cache.c index c7d5a1ee4b75..a81db0a8466a 100644 --- a/drivers/md/raid5-cache.c +++ b/drivers/md/raid5-cache.c @@ -194,6 +194,17 @@ static void __r5l_set_io_unit_state(struct r5l_io_unit *io, io->state = state; } +static void r5l_io_run_stripes(struct r5l_io_unit *io) +{ + struct stripe_head *sh, *next; + + list_for_each_entry_safe(sh, next, &io->stripe_list, log_list) { + list_del_init(&sh->log_list); + set_bit(STRIPE_HANDLE, &sh->state); + raid5_release_stripe(sh); + } +} + /* XXX: totally ignores I/O errors */ static void r5l_log_endio(struct bio *bio) { @@ -584,18 +595,10 @@ static void r5l_log_flush_endio(struct bio *bio) flush_bio); unsigned long flags; struct r5l_io_unit *io; - struct stripe_head *sh; spin_lock_irqsave(&log->io_list_lock, flags); - list_for_each_entry(io, &log->flushing_ios, log_sibling) { - while (!list_empty(&io->stripe_list)) { - sh = list_first_entry(&io->stripe_list, - struct stripe_head, log_list); - list_del_init(&sh->log_list); - set_bit(STRIPE_HANDLE, &sh->state); - raid5_release_stripe(sh); - } - } + list_for_each_entry(io, &log->flushing_ios, log_sibling) + r5l_io_run_stripes(io); list_splice_tail_init(&log->flushing_ios, &log->finished_ios); spin_unlock_irqrestore(&log->io_list_lock, flags); } |