Module Name: src
Committed By: tkusumi
Date: Wed Dec 18 14:31:35 UTC 2019
Modified Files:
src/sys/dev/dm: dm_target_error.c dm_target_linear.c dm_target_stripe.c
dm_target_zero.c
Log Message:
dm: Test # of args in target's ->init()
The # of args is part of target's spec.
Both Linux kernel and DragonFlyBSD test argc on ctr/init.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/sys/dev/dm/dm_target_error.c
cvs rdiff -u -r1.32 -r1.33 src/sys/dev/dm/dm_target_linear.c
cvs rdiff -u -r1.39 -r1.40 src/sys/dev/dm/dm_target_stripe.c
cvs rdiff -u -r1.27 -r1.28 src/sys/dev/dm/dm_target_zero.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/dm/dm_target_error.c
diff -u src/sys/dev/dm/dm_target_error.c:1.25 src/sys/dev/dm/dm_target_error.c:1.26
--- src/sys/dev/dm/dm_target_error.c:1.25 Mon Dec 16 14:26:23 2019
+++ src/sys/dev/dm/dm_target_error.c Wed Dec 18 14:31:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_error.c,v 1.25 2019/12/16 14:26:23 tkusumi Exp $ */
+/* $NetBSD: dm_target_error.c,v 1.26 2019/12/18 14:31:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.25 2019/12/16 14:26:23 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_error.c,v 1.26 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper error target.
@@ -101,6 +101,11 @@ int
dm_target_error_init(dm_table_entry_t *table_en, int argc, char **argv)
{
+ if (argc != 0) {
+ printf("Error target takes 0 args, %d given\n", argc);
+ return EINVAL;
+ }
+
printf("Error target init function called!!\n");
table_en->target_config = NULL;
Index: src/sys/dev/dm/dm_target_linear.c
diff -u src/sys/dev/dm/dm_target_linear.c:1.32 src/sys/dev/dm/dm_target_linear.c:1.33
--- src/sys/dev/dm/dm_target_linear.c:1.32 Sun Dec 15 16:14:27 2019
+++ src/sys/dev/dm/dm_target_linear.c Wed Dec 18 14:31:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_linear.c,v 1.32 2019/12/15 16:14:27 tkusumi Exp $ */
+/* $NetBSD: dm_target_linear.c,v 1.33 2019/12/18 14:31:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.32 2019/12/15 16:14:27 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_linear.c,v 1.33 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper dklinear target.
@@ -59,12 +59,10 @@ dm_target_linear_init(dm_table_entry_t *
dm_target_linear_config_t *tlc;
dm_pdev_t *dmp;
- /*
if (argc != 2) {
- printf("Linear target takes 2 args\n");
+ printf("Linear target takes 2 args, %d given\n", argc);
return EINVAL;
}
- */
aprint_debug("Linear target init function called %s--%s!!\n",
argv[0], argv[1]);
Index: src/sys/dev/dm/dm_target_stripe.c
diff -u src/sys/dev/dm/dm_target_stripe.c:1.39 src/sys/dev/dm/dm_target_stripe.c:1.40
--- src/sys/dev/dm/dm_target_stripe.c:1.39 Sun Dec 15 16:14:27 2019
+++ src/sys/dev/dm/dm_target_stripe.c Wed Dec 18 14:31:35 2019
@@ -1,4 +1,4 @@
-/*$NetBSD: dm_target_stripe.c,v 1.39 2019/12/15 16:14:27 tkusumi Exp $*/
+/*$NetBSD: dm_target_stripe.c,v 1.40 2019/12/18 14:31:35 tkusumi Exp $*/
/*
* Copyright (c) 2009 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.39 2019/12/15 16:14:27 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_stripe.c,v 1.40 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper stripe target.
@@ -139,12 +139,10 @@ dm_target_stripe_init(dm_table_entry_t *
dm_target_stripe_config_t *tsc;
int strpc, strpi;
- /*
- if (argc < 4) {
- printf("Stripe target takes 4 or more args\n");
+ if (argc < 2) {
+ printf("Stripe target takes at least 2 args, %d given\n", argc);
return EINVAL;
}
- */
printf("Stripe target init function called!!\n");
printf("Stripe target chunk size %s number of stripes %s\n",
Index: src/sys/dev/dm/dm_target_zero.c
diff -u src/sys/dev/dm/dm_target_zero.c:1.27 src/sys/dev/dm/dm_target_zero.c:1.28
--- src/sys/dev/dm/dm_target_zero.c:1.27 Mon Dec 16 14:26:23 2019
+++ src/sys/dev/dm/dm_target_zero.c Wed Dec 18 14:31:35 2019
@@ -1,4 +1,4 @@
-/* $NetBSD: dm_target_zero.c,v 1.27 2019/12/16 14:26:23 tkusumi Exp $ */
+/* $NetBSD: dm_target_zero.c,v 1.28 2019/12/18 14:31:35 tkusumi Exp $ */
/*
* Copyright (c) 2008 The NetBSD Foundation, Inc.
@@ -29,7 +29,7 @@
* POSSIBILITY OF SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.27 2019/12/16 14:26:23 tkusumi Exp $");
+__KERNEL_RCSID(0, "$NetBSD: dm_target_zero.c,v 1.28 2019/12/18 14:31:35 tkusumi Exp $");
/*
* This file implements initial version of device-mapper zero target.
@@ -104,6 +104,11 @@ int
dm_target_zero_init(dm_table_entry_t *table_en, int argc, char **argv)
{
+ if (argc != 0) {
+ printf("Zero target takes 0 args, %d given\n", argc);
+ return EINVAL;
+ }
+
printf("Zero target init function called!!\n");
table_en->target_config = NULL;
