10 files changed, 21 insertions, 32 deletions

diff --git a/drivers/md/dm-crypt.c b/drivers/md/dm-crypt.c
index a93637223c8d..3bdbb6115702 100644
--- a/drivers/md/dm-crypt.c
+++ b/drivers/md/dm-crypt.c
@@ -1160,8 +1160,7 @@ static int crypt_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         }
         cc->start = tmpll;
 
-        if (dm_get_device(ti, argv[3], cc->start, ti->len,
-                          dm_table_get_mode(ti->table), &cc->dev)) {
+        if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table), &cc->dev)) {
                 ti->error = "Device lookup failed";
                 goto bad_device;
         }
diff --git a/drivers/md/dm-delay.c b/drivers/md/dm-delay.c
index ebe7381f47c8..852052880d7a 100644
--- a/drivers/md/dm-delay.c
+++ b/drivers/md/dm-delay.c
@@ -156,8 +156,8 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad;
         }
 
-        if (dm_get_device(ti, argv[0], dc->start_read, ti->len,
-                          dm_table_get_mode(ti->table), &dc->dev_read)) {
+        if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
+                          &dc->dev_read)) {
                 ti->error = "Device lookup failed";
                 goto bad;
         }
@@ -177,8 +177,8 @@ static int delay_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 goto bad_dev_read;
         }
 
-        if (dm_get_device(ti, argv[3], dc->start_write, ti->len,
-                          dm_table_get_mode(ti->table), &dc->dev_write)) {
+        if (dm_get_device(ti, argv[3], dm_table_get_mode(ti->table),
+                          &dc->dev_write)) {
                 ti->error = "Write device lookup failed";
                 goto bad_dev_read;
         }
diff --git a/drivers/md/dm-linear.c b/drivers/md/dm-linear.c
index 82f7d6e6b1ea..9200dbf2391a 100644
--- a/drivers/md/dm-linear.c
+++ b/drivers/md/dm-linear.c
@@ -47,8 +47,7 @@ static int linear_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         }
         lc->start = tmp;
 
-        if (dm_get_device(ti, argv[0], lc->start, ti->len,
-                          dm_table_get_mode(ti->table), &lc->dev)) {
+        if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &lc->dev)) {
                 ti->error = "dm-linear: Device lookup failed";
                 goto bad;
         }
diff --git a/drivers/md/dm-log.c b/drivers/md/dm-log.c
index 7035582786fb..5a08be0222db 100644
--- a/drivers/md/dm-log.c
+++ b/drivers/md/dm-log.c
@@ -543,8 +543,7 @@ static int disk_ctr(struct dm_dirty_log *log, struct dm_target *ti,
                 return -EINVAL;
         }
 
-        r = dm_get_device(ti, argv[0], 0, 0 /* FIXME */,
-                          FMODE_READ | FMODE_WRITE, &dev);
+        r = dm_get_device(ti, argv[0], FMODE_READ | FMODE_WRITE, &dev);
         if (r)
                 return r;
 
diff --git a/drivers/md/dm-mpath.c b/drivers/md/dm-mpath.c
index c1335487cc72..826bce7343b3 100644
--- a/drivers/md/dm-mpath.c
+++ b/drivers/md/dm-mpath.c
@@ -607,8 +607,8 @@ static struct pgpath *parse_path(struct arg_set *as, struct path_selector *ps,
         if (!p)
                 return ERR_PTR(-ENOMEM);
 
-        r = dm_get_device(ti, shift(as), ti->begin, ti->len,
-                          dm_table_get_mode(ti->table), &p->path.dev);
+        r = dm_get_device(ti, shift(as), dm_table_get_mode(ti->table),
+                          &p->path.dev);
         if (r) {
                 ti->error = "error getting device";
                 goto bad;
@@ -1505,8 +1505,7 @@ static int multipath_message(struct dm_target *ti, unsigned argc, char **argv)
                 goto out;
         }
 
-        r = dm_get_device(ti, argv[1], ti->begin, ti->len,
-                          dm_table_get_mode(ti->table), &dev);
+        r = dm_get_device(ti, argv[1], dm_table_get_mode(ti->table), &dev);
         if (r) {
                 DMWARN("message: error getting device %s",
                        argv[1]);
diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index de26fde4098f..6d66ddf39071 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -920,8 +920,7 @@ static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                 return -EINVAL;
         }
 
-        if (dm_get_device(ti, argv[0], offset, ti->len,
-                          dm_table_get_mode(ti->table),
+        if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
                           &ms->mirror[mirror].dev)) {
                 ti->error = "Device lookup failure";
                 return -ENXIO;
diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index ee8eb283650d..0789c22ff0d4 100644
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -1081,8 +1081,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         argv++;
         argc--;
 
-        r = dm_get_device(ti, cow_path, 0, 0,
-                          FMODE_READ | FMODE_WRITE, &s->cow);
+        r = dm_get_device(ti, cow_path, FMODE_READ | FMODE_WRITE, &s->cow);
         if (r) {
                 ti->error = "Cannot get COW device";
                 goto bad_cow;
@@ -1098,7 +1097,7 @@ static int snapshot_ctr(struct dm_target *ti, unsigned int argc, char **argv)
         argv += args_used;
         argc -= args_used;
 
-        r = dm_get_device(ti, origin_path, 0, ti->len, origin_mode, &s->origin);
+        r = dm_get_device(ti, origin_path, origin_mode, &s->origin);
         if (r) {
                 ti->error = "Cannot get origin device";
                 goto bad_origin;
@@ -2100,8 +2099,7 @@ static int origin_ctr(struct dm_target *ti, unsigned int argc, char **argv)
                 return -EINVAL;
         }
 
-        r = dm_get_device(ti, argv[0], 0, ti->len,
-                          dm_table_get_mode(ti->table), &dev);
+        r = dm_get_device(ti, argv[0], dm_table_get_mode(ti->table), &dev);
         if (r) {
                 ti->error = "Cannot get target device";
                 return r;
diff --git a/drivers/md/dm-stripe.c b/drivers/md/dm-stripe.c
index bd58703ee8f6..e610725db766 100644
--- a/drivers/md/dm-stripe.c
+++ b/drivers/md/dm-stripe.c
@@ -80,8 +80,7 @@ static int get_stripe(struct dm_target *ti, struct stripe_c *sc,
         if (sscanf(argv[1], "%llu", &start) != 1)
                 return -EINVAL;
 
-        if (dm_get_device(ti, argv[0], start, sc->stripe_width,
-                          dm_table_get_mode(ti->table),
+        if (dm_get_device(ti, argv[0], dm_table_get_mode(ti->table),
                           &sc->stripe[stripe].dev))
                 return -ENXIO;
 
diff --git a/drivers/md/dm-table.c b/drivers/md/dm-table.c
index 7d70cca585ac..9924ea23032d 100644
--- a/drivers/md/dm-table.c
+++ b/drivers/md/dm-table.c
@@ -429,8 +429,7 @@ static int upgrade_mode(struct dm_dev_internal *dd, fmode_t new_mode,
  * it's already present.
  */
 static int __table_get_device(struct dm_table *t, struct dm_target *ti,
-                              const char *path, sector_t start, sector_t len,
-                              fmode_t mode, struct dm_dev **result)
+                      const char *path, fmode_t mode, struct dm_dev **result)
 {
         int r;
         dev_t uninitialized_var(dev);
@@ -527,11 +526,10 @@ int dm_set_device_limits(struct dm_target *ti, struct dm_dev *dev,
 }
 EXPORT_SYMBOL_GPL(dm_set_device_limits);
 
-int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
-                  sector_t len, fmode_t mode, struct dm_dev **result)
+int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
+                  struct dm_dev **result)
 {
-        return __table_get_device(ti->table, ti, path,
-                                  start, len, mode, result);
+        return __table_get_device(ti->table, ti, path, mode, result);
 }
 
 
diff --git a/include/linux/device-mapper.h b/include/linux/device-mapper.h
index d4c9c0b88adc..1381cd97b4ed 100644
--- a/include/linux/device-mapper.h
+++ b/include/linux/device-mapper.h
@@ -118,10 +118,9 @@ struct dm_dev {
 /*
  * Constructors should call these functions to ensure destination devices
  * are opened/closed correctly.
- * FIXME: too many arguments.
  */
-int dm_get_device(struct dm_target *ti, const char *path, sector_t start,
-                  sector_t len, fmode_t mode, struct dm_dev **result);
+int dm_get_device(struct dm_target *ti, const char *path, fmode_t mode,
+                                                 struct dm_dev **result);
 void dm_put_device(struct dm_target *ti, struct dm_dev *d);
 
 /*