[PATCH] dm: remove SECTOR_FORMAT

We don't know what type sector_t has.  Sometimes it's unsigned long, sometimes
it's unsigned long long.  For example on ppc64 it's unsigned long with
CONFIG_LBD=n and on x86_64 it's unsigned long long with CONFIG_LBD=n.

The way to handle all of this is to always use unsigned long long and to
always typecast the sector_t when printing it.

Acked-by: Alasdair G Kergon <agk@redhat.com>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>

1 files changed, 8 insertions, 7 deletions

diff --git a/drivers/md/dm-raid1.c b/drivers/md/dm-raid1.c
index 3d90f1b37e08..d12cf3e5e076 100644
--- a/drivers/md/dm-raid1.c
+++ b/drivers/md/dm-raid1.c
@@ -934,9 +934,9 @@ static inline int _check_region_size(struct dm_target *ti, uint32_t size)
 static int get_mirror(struct mirror_set *ms, struct dm_target *ti,
                       unsigned int mirror, char **argv)
 {
-        sector_t offset;
+        unsigned long long offset;
 
-        if (sscanf(argv[1], SECTOR_FORMAT, &offset) != 1) {
+        if (sscanf(argv[1], "%llu", &offset) != 1) {
                 ti->error = "dm-mirror: Invalid offset";
                 return -EINVAL;
         }
@@ -1203,16 +1203,17 @@ static int mirror_status(struct dm_target *ti, status_type_t type,
                 for (m = 0; m < ms->nr_mirrors; m++)
                         DMEMIT("%s ", ms->mirror[m].dev->name);
 
-                DMEMIT(SECTOR_FORMAT "/" SECTOR_FORMAT,
-                       ms->rh.log->type->get_sync_count(ms->rh.log),
-                       ms->nr_regions);
+                DMEMIT("%llu/%llu",
+                        (unsigned long long)ms->rh.log->type->
+                                get_sync_count(ms->rh.log),
+                        (unsigned long long)ms->nr_regions);
                 break;
 
         case STATUSTYPE_TABLE:
                 DMEMIT("%d ", ms->nr_mirrors);
                 for (m = 0; m < ms->nr_mirrors; m++)
-                        DMEMIT("%s " SECTOR_FORMAT " ",
-                               ms->mirror[m].dev->name, ms->mirror[m].offset);
+                        DMEMIT("%s %llu ", ms->mirror[m].dev->name,
+                                (unsigned long long)ms->mirror[m].offset);
         }
 
         return 0;