Module Name: src
Committed By: joerg
Date: Sat May 30 16:00:51 UTC 2015
Modified Files:
src/sbin/iscsid: iscsid_driverif.c iscsid_main.c
Log Message:
Remove ISCSI_DEBUG branches.
To generate a diff of this commit:
cvs rdiff -u -r1.6 -r1.7 src/sbin/iscsid/iscsid_driverif.c
cvs rdiff -u -r1.8 -r1.9 src/sbin/iscsid/iscsid_main.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sbin/iscsid/iscsid_driverif.c
diff -u src/sbin/iscsid/iscsid_driverif.c:1.6 src/sbin/iscsid/iscsid_driverif.c:1.7
--- src/sbin/iscsid/iscsid_driverif.c:1.6 Sat Dec 29 08:28:20 2012
+++ src/sbin/iscsid/iscsid_driverif.c Sat May 30 16:00:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_driverif.c,v 1.6 2012/12/29 08:28:20 mlelstv Exp $ */
+/* $NetBSD: iscsid_driverif.c,v 1.7 2015/05/30 16:00:51 joerg Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -70,11 +70,6 @@ set_node_name(iscsid_set_node_name_req_t
node_name = *par;
-#ifdef ISCSI_DEBUG /* DEBUG ONLY: Allow op without driver present */
- if (driver < 0)
- return ISCSID_STATUS_SUCCESS;
-#endif
-
strlcpy((char *)snp.InitiatorName, (char *)par->InitiatorName,
sizeof(snp.InitiatorName));
strlcpy((char *)snp.InitiatorAlias, (char *)par->InitiatorAlias,
@@ -850,10 +845,6 @@ get_version(iscsid_response_t ** prsp, i
ver->minor = VERSION_MINOR;
strlcpy ((char *)ver->version_string, VERSION_STRING, sizeof(ver->version_string));
-#ifdef ISCSI_DEBUG /* DEBUG ONLY: Allow op without driver present */
- if (driver < 0)
- return;
-#endif
ioctl(driver, ISCSI_GET_VERSION, &drv_ver);
ver->driver_interface_version = drv_ver.interface_version;
ver->driver_major = drv_ver.major;
Index: src/sbin/iscsid/iscsid_main.c
diff -u src/sbin/iscsid/iscsid_main.c:1.8 src/sbin/iscsid/iscsid_main.c:1.9
--- src/sbin/iscsid/iscsid_main.c:1.8 Sat Dec 29 08:28:20 2012
+++ src/sbin/iscsid/iscsid_main.c Sat May 30 16:00:51 2015
@@ -1,4 +1,4 @@
-/* $NetBSD: iscsid_main.c,v 1.8 2012/12/29 08:28:20 mlelstv Exp $ */
+/* $NetBSD: iscsid_main.c,v 1.9 2015/05/30 16:00:51 joerg Exp $ */
/*-
* Copyright (c) 2005,2006,2011 The NetBSD Foundation, Inc.
@@ -52,10 +52,7 @@ pthread_t event_thread; /* event threa
int driver = -1; /* the driver's file desc */
int client_sock; /* the client communication socket */
-#ifndef ISCSI_DEBUG
-#define ISCSI_DEBUG 0
-#endif
-int debug_level = ISCSI_DEBUG; /* How much info to display */
+int debug_level; /* How much info to display */
int nothreads;
/*
@@ -134,9 +131,7 @@ init_daemon(void)
if ((driver = open(DEVICE, O_RDONLY)) < 0) {
perror("opening " DEVICE);
-#ifndef ISCSI_DEBUG /* DEBUG ONLY: Allow daemon to operate w/o driver */
return -1;
-#endif
}
sock = socket(AF_UNIX, SOCK_DGRAM, 0);
