From 36fcffcc6500228efdfaf3a36761dd57a38366e3 Mon Sep 17 00:00:00 2001 From: Hannes Reinecke Date: Fri, 28 Feb 2014 15:33:47 +0100 Subject: dm mpath: remove map_io() multipath_map() is now just a wrapper around map_io(), so we can rename map_io() to multipath_map(). Signed-off-by: Hannes Reinecke Signed-off-by: Mike Snitzer Reviewed-by: Jun'ichi Nomura --- drivers/md/dm-mpath.c | 19 ++++++------------- 1 file changed, 6 insertions(+), 13 deletions(-) diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index 2c2c33f..07ca77f 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c @@ -375,9 +375,13 @@ static int __must_push_back(struct multipath *m) #define pg_ready(m) (!(m)->queue_io && !(m)->pg_init_required) -static int map_io(struct multipath *m, struct request *clone, - union map_info *map_context) +/* + * Map cloned requests + */ +static int multipath_map(struct dm_target *ti, struct request *clone, + union map_info *map_context) { + struct multipath *m = (struct multipath *) ti->private; int r = DM_MAPIO_REQUEUE; size_t nr_bytes = blk_rq_bytes(clone); unsigned long flags; @@ -909,17 +913,6 @@ static void multipath_dtr(struct dm_target *ti) } /* - * Map cloned requests - */ -static int multipath_map(struct dm_target *ti, struct request *clone, - union map_info *map_context) -{ - struct multipath *m = (struct multipath *) ti->private; - - return map_io(m, clone, map_context); -} - -/* * Take a path out of use. */ static int fail_path(struct pgpath *pgpath) -- cgit v1.1