summaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorHannes Reinecke <hare@suse.de>2014-02-28 15:33:47 +0100
committerMike Snitzer <snitzer@redhat.com>2014-03-27 21:56:25 +0100
commit36fcffcc6500228efdfaf3a36761dd57a38366e3 (patch)
treebb51c6bb77311a45df11f18903982562b0b8435c /drivers
parentdm mpath: reduce memory pressure when requeuing (diff)
downloadlinux-36fcffcc6500228efdfaf3a36761dd57a38366e3.tar.xz
linux-36fcffcc6500228efdfaf3a36761dd57a38366e3.zip
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 <hare@suse.de> Signed-off-by: Mike Snitzer <snitzer@redhat.com> Reviewed-by: Jun'ichi Nomura <j-nomura@ce.jp.nec.com>
Diffstat (limited to 'drivers')
-rw-r--r--drivers/md/dm-mpath.c19
1 files changed, 6 insertions, 13 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index 2c2c33f24998..07ca77f29438 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)