Commit 2e4a31df authored by Jonathan Brassow's avatar Jonathan Brassow Committed by Alasdair G Kergon

dm snapshot: use DMEMIT macro for status

Use DMEMIT in place of snprintf.  This makes it easier later when
other modules are helping to populate our status output.
Signed-off-by: default avatarJonathan Brassow <jbrassow@redhat.com>
Signed-off-by: default avatarAlasdair G Kergon <agk@redhat.com>
parent ccc45ea8
...@@ -1214,24 +1214,25 @@ static void snapshot_resume(struct dm_target *ti) ...@@ -1214,24 +1214,25 @@ static void snapshot_resume(struct dm_target *ti)
static int snapshot_status(struct dm_target *ti, status_type_t type, static int snapshot_status(struct dm_target *ti, status_type_t type,
char *result, unsigned int maxlen) char *result, unsigned int maxlen)
{ {
unsigned sz = 0;
struct dm_snapshot *snap = ti->private; struct dm_snapshot *snap = ti->private;
switch (type) { switch (type) {
case STATUSTYPE_INFO: case STATUSTYPE_INFO:
if (!snap->valid) if (!snap->valid)
snprintf(result, maxlen, "Invalid"); DMEMIT("Invalid");
else { else {
if (snap->store->type->fraction_full) { if (snap->store->type->fraction_full) {
sector_t numerator, denominator; sector_t numerator, denominator;
snap->store->type->fraction_full(snap->store, snap->store->type->fraction_full(snap->store,
&numerator, &numerator,
&denominator); &denominator);
snprintf(result, maxlen, "%llu/%llu", DMEMIT("%llu/%llu",
(unsigned long long)numerator, (unsigned long long)numerator,
(unsigned long long)denominator); (unsigned long long)denominator);
} }
else else
snprintf(result, maxlen, "Unknown"); DMEMIT("Unknown");
} }
break; break;
...@@ -1241,10 +1242,10 @@ static int snapshot_status(struct dm_target *ti, status_type_t type, ...@@ -1241,10 +1242,10 @@ static int snapshot_status(struct dm_target *ti, status_type_t type,
* to make private copies if the output is to * to make private copies if the output is to
* make sense. * make sense.
*/ */
snprintf(result, maxlen, "%s %s %s %llu", DMEMIT("%s", snap->origin->name);
snap->origin->name, snap->store->cow->name, DMEMIT(" %s %s %llu", snap->store->cow->name,
snap->store->type->name, snap->store->type->name,
(unsigned long long)snap->store->chunk_size); (unsigned long long)snap->store->chunk_size);
break; break;
} }
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment