aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMike Snitzer <snitzer@redhat.com>2014-06-03 10:30:28 -0400
committerMike Snitzer <snitzer@redhat.com>2014-06-04 09:46:34 -0400
commit11f0431be2f99c574a65c6dfc0ca205511500f29 (patch)
tree846f5dc90734238e7349b8638c6b1fa6a87da840
parent7eee4ae2dbb2be0a15a4406718806e48b18ba831 (diff)
dm: remove symbol export for dm_set_device_limits
There is no need for code other than DM core to use dm_set_device_limits so remove its EXPORT_SYMBOL_GPL. Also, cleanup a couple whitespace nits. Signed-off-by: Mike Snitzer <snitzer@redhat.com>
-rw-r--r--drivers/md/dm-table.c5
-rw-r--r--drivers/md/dm.c1
-rw-r--r--include/linux/device-mapper.h8
3 files changed, 3 insertions, 11 deletions
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 50601ec7017a..5f59f1e3e5b1 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -465,8 +465,8 @@ int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
465} 465}
466EXPORT_SYMBOL(dm_get_device); 466EXPORT_SYMBOL(dm_get_device);
467 467
468int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev, 468static int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
469 sector_t start, sector_t len, void *data) 469 sector_t start, sector_t len, void *data)
470{ 470{
471 struct queue_limits *limits = data; 471 struct queue_limits *limits = data;
472 struct block_device *bdev = dev->bdev; 472 struct block_device *bdev = dev->bdev;
@@ -499,7 +499,6 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
499 (unsigned int) (PAGE_SIZE >> 9)); 499 (unsigned int) (PAGE_SIZE >> 9));
500 return 0; 500 return 0;
501} 501}
502EXPORT_SYMBOL_GPL(dm_set_device_limits);
503 502
504/* 503/*
505 * Decrement a device's use count and remove it if necessary. 504 * Decrement a device's use count and remove it if necessary.
diff --git a/drivers/md/dm.c b/drivers/md/dm.c
index 3234a753a80d..bf1a1eaad9a9 100644
--- a/drivers/md/dm.c
+++ b/drivers/md/dm.c
@@ -1498,7 +1498,6 @@ static int dm_merge_bvec(struct request_queue *q,
1498 * just one page. 1498 * just one page.
1499 */ 1499 */
1500 else if (queue_max_hw_sectors(q) <= PAGE_SIZE >> 9) 1500 else if (queue_max_hw_sectors(q) <= PAGE_SIZE >> 9)
1501
1502 max_size = 0; 1501 max_size = 0;
1503 1502
1504out: 1503out:
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index 0adca299f238..e1707de043ae 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -115,12 +115,6 @@ typedef int (*dm_busy_fn) (struct dm_target *ti);
115 115
116void dm_error(const char *message); 116void dm_error(const char *message);
117 117
118/*
119 * Combine device limits.
120 */
121int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
122 sector_t start, sector_t len, void *data);
123
124struct dm_dev { 118struct dm_dev {
125 struct block_device *bdev; 119 struct block_device *bdev;
126 fmode_t mode; 120 fmode_t mode;
@@ -132,7 +126,7 @@ struct dm_dev {
132 * are opened/closed correctly. 126 * are opened/closed correctly.
133 */ 127 */
134int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode, 128int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
135 struct dm_dev **result); 129 struct dm_dev **result);
136void dm_put_device(struct dm_target *ti, struct dm_dev *d); 130void dm_put_device(struct dm_target *ti, struct dm_dev *d);
137 131
138/* 132/*