Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1031621AbbKECE1 (ORCPT <rfc822;w@1wt.eu>);
	Wed, 4 Nov 2015 21:04:27 -0500
Received: from mail-wi0-f175.google.com ([209.85.212.175]:37470 "EHLO
	mail-wi0-f175.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
	with ESMTP id S1755981AbbKECDG (ORCPT
	<rfc822;linux-kernel@vger.kernel.org>);
	Wed, 4 Nov 2015 21:03:06 -0500
From: Sami Tolvanen <samitolvanen@google.com>
To: Mikulas Patocka <mpatocka@redhat.com>, Mandeep Baines <msb@chromium.org>,
        Will Drewry <wad@chromium.org>
Cc: Alasdair Kergon <agk@redhat.com>, Mike Snitzer <snitzer@redhat.com>,
        dm-devel@redhat.com, linux-kernel@vger.kernel.org,
        Kees Cook <keescook@chromium.org>, Mark Salyzyn <salyzyn@google.com>,
        Sami Tolvanen <samitolvanen@google.com>
Subject: [PATCH 2/4] dm verity: separate function for parsing opt args
Date: Thu,  5 Nov 2015 02:02:32 +0000
Message-Id: <1446688954-29589-3-git-send-email-samitolvanen@google.com>
X-Mailer: git-send-email 2.6.0.rc2.230.g3dd15c0
In-Reply-To: <1446688954-29589-1-git-send-email-samitolvanen@google.com>
References: <1446688954-29589-1-git-send-email-samitolvanen@google.com>
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org
Content-Length: 2441
Lines: 80

Move optional argument parsing into a separate function to make it
easier to add more of them without making verity_ctr even longer.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
---
 drivers/md/dm-verity.c | 31 ++++++++++++++++++++++---------
 1 file changed, 22 insertions(+), 9 deletions(-)

diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c
index 487cb66..da76f77 100644
--- a/drivers/md/dm-verity.c
+++ b/drivers/md/dm-verity.c
@@ -34,6 +34,8 @@
 #define DM_VERITY_OPT_LOGGING		"ignore_corruption"
 #define DM_VERITY_OPT_RESTART		"restart_on_corruption"
 
+#define DM_VERITY_OPTS_MAX		1
+
 static unsigned dm_verity_prefetch_cluster = DM_VERITY_DEFAULT_PREFETCH_SIZE;
 
 module_param_named(prefetch_cluster, dm_verity_prefetch_cluster, uint, S_IRUGO | S_IWUSR);
@@ -725,6 +727,21 @@ static void verity_dtr(struct dm_target *ti)
 	kfree(v);
 }
 
+static int verity_parse_opt_args(struct dm_arg_set *as, struct dm_verity *v,
+				 const char *opt_string)
+{
+	if (!strcasecmp(opt_string, DM_VERITY_OPT_LOGGING)) {
+		v->mode = DM_VERITY_MODE_LOGGING;
+		return 0;
+	} else if (!strcasecmp(opt_string, DM_VERITY_OPT_RESTART)) {
+		v->mode = DM_VERITY_MODE_RESTART;
+		return 0;
+	}
+
+	v->ti->error = "Invalid feature arguments";
+	return -EINVAL;
+}
+
 /*
  * Target parameters:
  *	<version>	The current format is version 1.
@@ -752,7 +769,7 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
 	char dummy;
 
 	static struct dm_arg _args[] = {
-		{0, 1, "Invalid number of feature args"},
+		{0, DM_VERITY_OPTS_MAX, "Invalid number of feature args"},
 	};
 
 	v = kzalloc(sizeof(struct dm_verity), GFP_KERNEL);
@@ -912,15 +929,11 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv)
 				goto bad;
 			}
 
-			if (!strcasecmp(opt_string, DM_VERITY_OPT_LOGGING))
-				v->mode = DM_VERITY_MODE_LOGGING;
-			else if (!strcasecmp(opt_string, DM_VERITY_OPT_RESTART))
-				v->mode = DM_VERITY_MODE_RESTART;
-			else {
-				ti->error = "Invalid feature arguments";
-				r = -EINVAL;
+			r = verity_parse_opt_args(&as, v, opt_string);
+			if (r < 0)
 				goto bad;
-			}
+
+			opt_params -= r;
 		}
 	}
 
-- 
2.6.0.rc2.230.g3dd15c0

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/