Skip to content

Commit

Permalink
dm mpath: remove map_io()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Hannes Reinecke authored and Mike Snitzer committed Mar 27, 2014
1 parent e3bde04 commit 36fcffc
Showing 1 changed file with 6 additions and 13 deletions.
19 changes: 6 additions & 13 deletions drivers/md/dm-mpath.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -908,17 +912,6 @@ static void multipath_dtr(struct dm_target *ti)
free_multipath(m);
}

/*
* 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.
*/
Expand Down

0 comments on commit 36fcffc

Please sign in to comment.