vserver 2.0 rc7

[linux-2.6.git] / drivers / md / dm-snap.c

diff --git a/drivers/md/dm-snap.c b/drivers/md/dm-snap.c
index 36691ab..7e691ab 100644 (file)
--- a/drivers/md/dm-snap.c
+++ b/drivers/md/dm-snap.c
@@ -864,8 +864,6 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
                           char *result, unsigned int maxlen)
 {
        struct dm_snapshot *snap = (struct dm_snapshot *) ti->private;
-       char cow[32];
-       char org[32];
 
        switch (type) {
        case STATUSTYPE_INFO:
@@ -892,9 +890,8 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
                 * to make private copies if the output is to
                 * make sense.
                 */
-               format_dev_t(cow, snap->cow->bdev->bd_dev);
-               format_dev_t(org, snap->origin->bdev->bd_dev);
-               snprintf(result, maxlen, "%s %s %c " SECTOR_FORMAT, org, cow,
+               snprintf(result, maxlen, "%s %s %c " SECTOR_FORMAT,
+                        snap->origin->name, snap->cow->name,
                         snap->type, snap->chunk_size);
                break;
        }
@@ -1082,7 +1079,6 @@ static int origin_status(struct dm_target *ti, status_type_t type, char *result,
                         unsigned int maxlen)
 {
        struct dm_dev *dev = (struct dm_dev *) ti->private;
-       char buffer[32];
 
        switch (type) {
        case STATUSTYPE_INFO:
@@ -1090,8 +1086,7 @@ static int origin_status(struct dm_target *ti, status_type_t type, char *result,
                break;
 
        case STATUSTYPE_TABLE:
-               format_dev_t(buffer, dev->bdev->bd_dev);
-               snprintf(result, maxlen, "%s", buffer);
+               snprintf(result, maxlen, "%s", dev->name);
                break;
        }