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/raid10.c | |
parent | pmem, memremap: convert to numa aware allocations (diff) | |
parent | acpi: nfit: Add support for hot-add (diff) | |
download | linux-dev-85ce230051c37dfb979385eb0244bf3655625ba6.tar.xz linux-dev-85ce230051c37dfb979385eb0244bf3655625ba6.zip |
Merge branch 'for-4.4/hotplug' into libnvdimm-for-next
Diffstat (limited to 'drivers/md/raid10.c')
-rw-r--r-- | drivers/md/raid10.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/drivers/md/raid10.c b/drivers/md/raid10.c index 7c99a4037715..9f69dc526f8c 100644 --- a/drivers/md/raid10.c +++ b/drivers/md/raid10.c @@ -2688,8 +2688,8 @@ static void raid10d(struct md_thread *thread) } spin_unlock_irqrestore(&conf->device_lock, flags); while (!list_empty(&tmp)) { - r10_bio = list_first_entry(&conf->bio_end_io_list, - struct r10bio, retry_list); + r10_bio = list_first_entry(&tmp, struct r10bio, + retry_list); list_del(&r10_bio->retry_list); raid_end_bio_io(r10_bio); } |