Skip to contentSkip to conversation

: dm-snapshot-new-ctr-table-format.patch

PATCH In review Jonathan Brassow 3 participants 3 messages Jan 20, 2009 – Feb 2, 2009 Device mapper

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 : dm-snapshot-new-ctr-table-format.patch

brassow

Introduce the new constructor table formats for snapshots and exception stores. This allows for new exception store types and allows for easy addition of future features to snapshots.

drivers/md/dm-snap-persistent.c +7 -2
Index: linux-2.6/drivers/md/dm-snap-persistent.c
===================================================================
@@ -698,8 +698,13 @@ static int persistent_status(struct dm_e
 	case STATUSTYPE_INFO:
 		break;
 	case STATUSTYPE_TABLE:
-		DMEMIT("%s P %llu", store->cow->name,
-		       (unsigned long long)store->chunk_size);
+		if (!strcmp("P", store->type->name))
+			DMEMIT("%s P %llu", store->cow->name,
+			       (unsigned long long)store->chunk_size);
+		else
+			DMEMIT("%s 2 %s %llu", store->type->name,
+			       store->cow->name,
+			       (unsigned long long)store->chunk_size);
 	}
 
 	return sz;
drivers/md/dm-snap-transient.c +7 -2
Index: linux-2.6/drivers/md/dm-snap-transient.c
===================================================================
@@ -91,8 +91,13 @@ static int transient_status(struct dm_ex
 	case STATUSTYPE_INFO:
 		break;
 	case STATUSTYPE_TABLE:
-		DMEMIT("%s N %llu", store->cow->name,
-		       (unsigned long long)store->chunk_size);
+		if (!strcmp("N", store->type->name))
+			DMEMIT("%s N %llu", store->cow->name,
+			       (unsigned long long)store->chunk_size);
+		else
+			DMEMIT("%s 2 %s %llu", store->type->name,
+			       store->cow->name,
+			       (unsigned long long)store->chunk_size);
 	}
 
 	return sz;
drivers/md/dm-snap.c +35 -7

86 lines not on this page · raw message

#1 lore raw
Quoted 16 lines · On Tue, 20 Jan 2009 14:14:27 -0600 Jonathan Brassow <[email protected]> wrote:
drivers/md/dm-snap.c +8 -1
-	if (1 /* less change patch to patch */) {
+	/* Detect old-style table line with type as second arg. */
+	if (!isdigit(*argv[1])) {
 		if (argc < 3) {
 			ti->error = "Insufficient exception store arguments";
 			return -EINVAL;
@@ -605,10 +611,34 @@ static int create_exception_store(struct
 		return dm_exception_store_create(toupper(*argv[1]), ti, 2,
 						 tmp_argv, store);
 	}
+
+	if (sscanf(argv[1], "%u", &param_count) != 1) {
+		ti->error = "Invalid exception store argument count";
+		return -EINVAL;
+	}
+

drivers/md/dm-snap.c static int create_exception_store(struct · line 629

Quoted 10 lines
drivers/md/dm-snap.c +9 -0
+	*args_used = 2 + param_count;
+
+	if (argc < *args_used) {
+		ti->error = "Insufficient exception store arguments";
+		return -EINVAL;
+	}
+
+	return dm_exception_store_create(argv[0], ti, param_count,
+					 argv + 2, store);
 }

Seems that this gives me:

drivers/md/dm-snap.c: In function 'create_exception_store':
drivers/md/dm-snap.c:613: warning: passing argument 1 of 'dm_exception_store_create' makes pointer from integer without a cast

BTW, how about adding something like 'compat_name' to struct dm_exception_store_type instead of registering two similar structures like the followings?

static struct dm_exception_store_type _persistent_type = {
.name = "persistent",
.module = THIS_MODULE,
.ctr = persistent_ctr,
.dtr = persistent_dtr,
.read_metadata = persistent_read_metadata, .prepare_exception = persistent_prepare_exception, .commit_exception = persistent_commit_exception, .drop_snapshot = persistent_drop_snapshot, .fraction_full = persistent_fraction_full, .status = persistent_status,
};

static struct dm_exception_store_type _persistent_compat_type = {
.name = "P",
.module = THIS_MODULE,
.ctr = persistent_ctr,
.dtr = persistent_dtr,
.read_metadata = persistent_read_metadata, .prepare_exception = persistent_prepare_exception, .commit_exception = persistent_commit_exception, .drop_snapshot = persistent_drop_snapshot, .fraction_full = persistent_fraction_full, .status = persistent_status,
};

#2 lore raw
Quoted 3 lines · FUJITA Tomonori

BTW, how about adding something like 'compat_name' to struct dm_exception_store_type instead of registering two similar structures like the followings?

Not worth the bother. You've still to record somewhere whether it's the compat name that matched or not so the 'dmsetup table' output matches the input.

Alasdair

Signature · 1 line
[email protected]