aboutsummaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorGary Robertson <gary.robertson@linaro.org>2013-10-31 17:57:05 -0700
committerGary Robertson <gary.robertson@linaro.org>2013-10-31 17:57:05 -0700
commitb7fbb07e1d6744e87079a12dc29f7c2fb8205c26 (patch)
treee51ff461b46a470c81d62c6d86853187646624c3 /include
parent4da2c19b694dd0e5932cee3eeb40df3e637628cc (diff)
parentcac65253a9c5a30d4c8d7bc4c60197935f9e2e70 (diff)
Merge tag 'v3.10.15' of git://git.kernel.org/pub/scm/linux/kernel/git/stable/linux-stable into linux-lnglinux-lng-v3.10.15-final
This is the 3.10.15 stable release
Diffstat (limited to 'include')
-rw-r--r--include/linux/device-mapper.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 3cd32478f2fd..ef5bd3ff7eb4 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -405,13 +405,14 @@ int dm_noflush_suspending(struct dm_target *ti);
union map_info *dm_get_mapinfo(struct bio *bio);
union map_info *dm_get_rq_mapinfo(struct request *rq);
+struct queue_limits *dm_get_queue_limits(struct mapped_device *md);
+
/*
* Geometry functions.
*/
int dm_get_geometry(struct mapped_device *md, struct hd_geometry *geo);
int dm_set_geometry(struct mapped_device *md, struct hd_geometry *geo);
-
/*-----------------------------------------------------------------
* Functions for manipulating device-mapper tables.
*---------------------------------------------------------------*/