From owner-svn-src-stable-10@FreeBSD.ORG Tue Mar 25 11:53:48 2014
Return-Path: <owner-svn-src-stable-10@FreeBSD.ORG>
Delivered-To: svn-src-stable-10@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115])
(using TLSv1 with cipher ADH-AES256-SHA (256/256 bits))
(No client certificate requested)
by hub.freebsd.org (Postfix) with ESMTPS id 151F1711;
Tue, 25 Mar 2014 11:53:48 +0000 (UTC)
Received: from svn.freebsd.org (svn.freebsd.org
[IPv6:2001:1900:2254:2068::e6a:0])
(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
(No client certificate requested)
by mx1.freebsd.org (Postfix) with ESMTPS id EA001FC8;
Tue, 25 Mar 2014 11:53:47 +0000 (UTC)
Received: from svn.freebsd.org ([127.0.1.70])
by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2PBrlps063994;
Tue, 25 Mar 2014 11:53:47 GMT (envelope-from trasz@svn.freebsd.org)
Received: (from trasz@localhost)
by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2PBrlso063993;
Tue, 25 Mar 2014 11:53:47 GMT (envelope-from trasz@svn.freebsd.org)
Message-Id: <201403251153.s2PBrlso063993@svn.freebsd.org>
From: Edward Tomasz Napierala <trasz@FreeBSD.org>
Date: Tue, 25 Mar 2014 11:53:47 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject: svn commit: r263717 - stable/10/usr.sbin/ctld
X-SVN-Group: stable-10
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-src-stable-10@freebsd.org
X-Mailman-Version: 2.1.17
Precedence: list
List-Id: SVN commit messages for only the 10-stable src tree
<svn-src-stable-10.freebsd.org>
List-Unsubscribe: <https://lists.freebsd.org/mailman/options/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable-10/>
List-Post: <mailto:svn-src-stable-10@freebsd.org>
List-Help: <mailto:svn-src-stable-10-request@freebsd.org?subject=help>
List-Subscribe: <https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10>,
<mailto:svn-src-stable-10-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 25 Mar 2014 11:53:48 -0000
Author: trasz
Date: Tue Mar 25 11:53:47 2014
New Revision: 263717
URL: http://svnweb.freebsd.org/changeset/base/263717
Log:
MFC r261749:
Refactor.
Sponsored by: The FreeBSD Foundation
Modified:
stable/10/usr.sbin/ctld/ctld.c
Directory Properties:
stable/10/ (props changed)
Modified: stable/10/usr.sbin/ctld/ctld.c
==============================================================================
--- stable/10/usr.sbin/ctld/ctld.c Tue Mar 25 11:46:46 2014 (r263716)
+++ stable/10/usr.sbin/ctld/ctld.c Tue Mar 25 11:53:47 2014 (r263717)
@@ -869,14 +869,74 @@ conf_print(struct conf *conf)
}
#endif
+static int
+conf_verify_lun(struct lun *lun)
+{
+ const struct lun *lun2;
+
+ if (lun->l_backend == NULL)
+ lun_set_backend(lun, "block");
+ if (strcmp(lun->l_backend, "block") == 0) {
+ if (lun->l_path == NULL) {
+ log_warnx("missing path for lun %d, target \"%s\"",
+ lun->l_lun, lun->l_target->t_iqn);
+ return (1);
+ }
+ } else if (strcmp(lun->l_backend, "ramdisk") == 0) {
+ if (lun->l_size == 0) {
+ log_warnx("missing size for ramdisk-backed lun %d, "
+ "target \"%s\"", lun->l_lun, lun->l_target->t_iqn);
+ return (1);
+ }
+ if (lun->l_path != NULL) {
+ log_warnx("path must not be specified "
+ "for ramdisk-backed lun %d, target \"%s\"",
+ lun->l_lun, lun->l_target->t_iqn);
+ return (1);
+ }
+ }
+ if (lun->l_lun < 0 || lun->l_lun > 255) {
+ log_warnx("invalid lun number for lun %d, target \"%s\"; "
+ "must be between 0 and 255", lun->l_lun,
+ lun->l_target->t_iqn);
+ return (1);
+ }
+#if 1 /* Should we? */
+ TAILQ_FOREACH(lun2, &lun->l_target->t_luns, l_next) {
+ if (lun == lun2)
+ continue;
+ if (lun->l_path != NULL && lun2->l_path != NULL &&
+ strcmp(lun->l_path, lun2->l_path) == 0)
+ log_debugx("WARNING: duplicate path for lun %d, "
+ "target \"%s\"", lun->l_lun, lun->l_target->t_iqn);
+ }
+#endif
+ if (lun->l_blocksize == 0) {
+ lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
+ } else if (lun->l_blocksize < 0) {
+ log_warnx("invalid blocksize for lun %d, target \"%s\"; "
+ "must be larger than 0", lun->l_lun, lun->l_target->t_iqn);
+ return (1);
+ }
+ if (lun->l_size != 0 && lun->l_size % lun->l_blocksize != 0) {
+ log_warnx("invalid size for lun %d, target \"%s\"; "
+ "must be multiple of blocksize", lun->l_lun,
+ lun->l_target->t_iqn);
+ return (1);
+ }
+
+ return (0);
+}
+
int
conf_verify(struct conf *conf)
{
struct auth_group *ag;
struct portal_group *pg;
struct target *targ;
- struct lun *lun, *lun2;
+ struct lun *lun;
bool found_lun0;
+ int error;
if (conf->conf_pidfile_path == NULL)
conf->conf_pidfile_path = checked_strdup(DEFAULT_PIDFILE);
@@ -895,65 +955,11 @@ conf_verify(struct conf *conf)
}
found_lun0 = false;
TAILQ_FOREACH(lun, &targ->t_luns, l_next) {
+ error = conf_verify_lun(lun);
+ if (error != 0)
+ return (error);
if (lun->l_lun == 0)
found_lun0 = true;
- if (lun->l_backend == NULL)
- lun_set_backend(lun, "block");
- if (strcmp(lun->l_backend, "block") == 0 &&
- lun->l_path == NULL) {
- log_warnx("missing path for lun %d, "
- "target \"%s\"", lun->l_lun, targ->t_iqn);
- return (1);
- }
- if (strcmp(lun->l_backend, "ramdisk") == 0) {
- if (lun->l_size == 0) {
- log_warnx("missing size for "
- "ramdisk-backed lun %d, "
- "target \"%s\"",
- lun->l_lun, targ->t_iqn);
- return (1);
- }
- if (lun->l_path != NULL) {
- log_warnx("path must not be specified "
- "for ramdisk-backed lun %d, "
- "target \"%s\"",
- lun->l_lun, targ->t_iqn);
- return (1);
- }
- }
- if (lun->l_lun < 0 || lun->l_lun > 255) {
- log_warnx("invalid lun number for lun %d, "
- "target \"%s\"; must be between 0 and 255",
- lun->l_lun, targ->t_iqn);
- return (1);
- }
-#if 1 /* Should we? */
- TAILQ_FOREACH(lun2, &targ->t_luns, l_next) {
- if (lun == lun2)
- continue;
- if (lun->l_path != NULL &&
- lun2->l_path != NULL &&
- strcmp(lun->l_path, lun2->l_path) == 0)
- log_debugx("WARNING: duplicate path "
- "for lun %d, target \"%s\"",
- lun->l_lun, targ->t_iqn);
- }
-#endif
- if (lun->l_blocksize == 0) {
- lun_set_blocksize(lun, DEFAULT_BLOCKSIZE);
- } else if (lun->l_blocksize <= 0) {
- log_warnx("invalid blocksize for lun %d, "
- "target \"%s\"; must be larger than 0",
- lun->l_lun, targ->t_iqn);
- return (1);
- }
- if (lun->l_size != 0 &&
- lun->l_size % lun->l_blocksize != 0) {
- log_warnx("invalid size for lun %d, target "
- "\"%s\"; must be multiple of blocksize",
- lun->l_lun, targ->t_iqn);
- return (1);
- }
}
if (!found_lun0) {
log_warnx("mandatory LUN 0 not configured "