diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 13:29:39 -0500 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2015-11-09 13:29:39 -0500 |
| commit | 85ce230051c37dfb979385eb0244bf3655625ba6 (patch) | |
| tree | 90abeab25f8c1ea4836b38279790b90f0c780ae3 /drivers/md/raid1.c | |
| parent | 538ea4aa44737127ce2b5c8511c7349d2abdcf9c (diff) | |
| parent | 209851649dc4f7900a6bfe1de5e2640ab2c7d931 (diff) | |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
Diffstat (limited to 'drivers/md/raid1.c')
| -rw-r--r-- | drivers/md/raid1.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid1.c b/drivers/md/raid1.c index 049df6c4a8cc..ddd8a5f572aa 100644 --- a/drivers/md/raid1.c +++ b/drivers/md/raid1.c @@ -2382,8 +2382,8 @@ static void raid1d(struct md_thread *thread) } spin_unlock_irqrestore(&conf->device_lock, flags); while (!list_empty(&tmp)) { - r1_bio = list_first_entry(&conf->bio_end_io_list, - struct r1bio, retry_list); + r1_bio = list_first_entry(&tmp, struct r1bio, + retry_list); list_del(&r1_bio->retry_list); raid_end_bio_io(r1_bio); } |