diff options
author | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 14:42:39 +0200 |
---|---|---|
committer | Thomas Gleixner <tglx@linutronix.de> | 2017-10-05 14:42:39 +0200 |
commit | 26eafeaab917dd228d292f362be1577c9b4b2e77 (patch) | |
tree | bd89e0ed1c11635d184c7b497aac6ddd967ebde8 /drivers/md/dm-raid.c | |
parent | timekeeping: Provide NMI safe access to clock realtime (diff) | |
parent | Merge branch 'for-4.14-fixes' of git://git.kernel.org/pub/scm/linux/kernel/gi... (diff) | |
download | linux-26eafeaab917dd228d292f362be1577c9b4b2e77.tar.xz linux-26eafeaab917dd228d292f362be1577c9b4b2e77.zip |
Merge branch 'linus' into timers/core
Pick up upstream changes to get the prerequisites for the timer changes.
Diffstat (limited to 'drivers/md/dm-raid.c')
-rw-r--r-- | drivers/md/dm-raid.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/md/dm-raid.c b/drivers/md/dm-raid.c index 5bfe285ea9d1..1ac58c5651b7 100644 --- a/drivers/md/dm-raid.c +++ b/drivers/md/dm-raid.c @@ -3238,7 +3238,7 @@ static int raid_map(struct dm_target *ti, struct bio *bio) if (unlikely(bio_end_sector(bio) > mddev->array_sectors)) return DM_MAPIO_REQUEUE; - mddev->pers->make_request(mddev, bio); + md_handle_request(mddev, bio); return DM_MAPIO_SUBMITTED; } |