Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

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

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

drivers/md/dm-snap.c

+10 −9
Original line number Diff line number Diff line
@@ -1214,24 +1214,25 @@ static void snapshot_resume(struct dm_target *ti) 
static int snapshot_status(struct dm_target *ti, status_type_t type,

			   char *result, unsigned int maxlen)

{

	unsigned sz = 0;

	struct dm_snapshot *snap = ti->private;



	switch (type) {

	case STATUSTYPE_INFO:

		if (!snap->valid)

			snprintf(result, maxlen, "Invalid");

			DMEMIT("Invalid");

		else {

			if (snap->store->type->fraction_full) {

				sector_t numerator, denominator;

				snap->store->type->fraction_full(snap->store,

								 &numerator,

								 &denominator);

				snprintf(result, maxlen, "%llu/%llu",

				DMEMIT("%llu/%llu",

				       (unsigned long long)numerator,

				       (unsigned long long)denominator);

			}

			else

				snprintf(result, maxlen, "Unknown");

				DMEMIT("Unknown");

		}

		break;
@@ -1241,8 +1242,8 @@ static int snapshot_status(struct dm_target *ti, status_type_t type, 
		 * to make private copies if the output is to

		 * make sense.

		 */

		snprintf(result, maxlen, "%s %s %s %llu",

			 snap->origin->name, snap->store->cow->name,

		DMEMIT("%s", snap->origin->name);

		DMEMIT(" %s %s %llu", snap->store->cow->name,

		       snap->store->type->name,

		       (unsigned long long)snap->store->chunk_size);

		break;