diff options
author | Mike Snitzer <snitzer@redhat.com> | 2015-02-23 16:36:41 -0500 |
---|---|---|
committer | Mike Snitzer <snitzer@redhat.com> | 2015-03-31 12:03:49 -0400 |
commit | 52b09914af86fa3e728175c1125c91520e437b2f (patch) | |
tree | f2cea55f24fb5273f60927cc9314a318f6754fa1 | |
parent | 09c2d53101da87f5ab4084643d2f8c718b3ab3cf (diff) |
dm: remove unnecessary wrapper around blk_lld_busy
There is no need for DM to export a wrapper around the already exported
blk_lld_busy().
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r-- | drivers/md/dm-mpath.c | 2 | ||||
-rw-r--r-- | drivers/md/dm.c | 6 | ||||
-rw-r--r-- | include/linux/device-mapper.h | 5 |
3 files changed, 1 insertions, 12 deletions
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c index d376dc87716e..add6391f3f8e 100644 --- a/drivers/md/dm-mpath.c +++ b/drivers/md/dm-mpath.c | |||
@@ -1627,7 +1627,7 @@ static int __pgpath_busy(struct pgpath *pgpath) | |||
1627 | { | 1627 | { |
1628 | struct request_queue *q = bdev_get_queue(pgpath->path.dev->bdev); | 1628 | struct request_queue *q = bdev_get_queue(pgpath->path.dev->bdev); |
1629 | 1629 | ||
1630 | return dm_underlying_device_busy(q); | 1630 | return blk_lld_busy(q); |
1631 | } | 1631 | } |
1632 | 1632 | ||
1633 | /* | 1633 | /* |
diff --git a/drivers/md/dm.c b/drivers/md/dm.c index 0e5f3441fcda..e7095ebb8d64 100644 --- a/drivers/md/dm.c +++ b/drivers/md/dm.c | |||
@@ -2006,12 +2006,6 @@ out: | |||
2006 | dm_put_live_table(md, srcu_idx); | 2006 | dm_put_live_table(md, srcu_idx); |
2007 | } | 2007 | } |
2008 | 2008 | ||
2009 | int dm_underlying_device_busy(struct request_queue *q) | ||
2010 | { | ||
2011 | return blk_lld_busy(q); | ||
2012 | } | ||
2013 | EXPORT_SYMBOL_GPL(dm_underlying_device_busy); | ||
2014 | |||
2015 | static int dm_lld_busy(struct request_queue *q) | 2009 | static int dm_lld_busy(struct request_queue *q) |
2016 | { | 2010 | { |
2017 | int r; | 2011 | int r; |
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h index fd23978d93fe..51cc1deb7af3 100644 --- a/include/linux/device-mapper.h +++ b/include/linux/device-mapper.h | |||
@@ -605,9 +605,4 @@ static inline unsigned long to_bytes(sector_t n) | |||
605 | return (n << SECTOR_SHIFT); | 605 | return (n << SECTOR_SHIFT); |
606 | } | 606 | } |
607 | 607 | ||
608 | /*----------------------------------------------------------------- | ||
609 | * Helper for block layer and dm core operations | ||
610 | *---------------------------------------------------------------*/ | ||
611 | int dm_underlying_device_busy(struct request_queue *q); | ||
612 | |||
613 | #endif /* _LINUX_DEVICE_MAPPER_H */ | 608 | #endif /* _LINUX_DEVICE_MAPPER_H */ |