[Pkg-iscsi-maintainers] [SCM] Debian Open-iSCSI Packaging branch, upstream-mnc, updated. 2.0-872-193-gde2c0e7

Mike Christie michaelc at cs.wisc.edu
Sat Apr 7 15:44:11 UTC 2012


The following commit has been merged in the upstream-mnc branch:
commit 312f7370e81750efb71a15f98d87a5189fecc0ac
Author: Mike Christie <michaelc at cs.wisc.edu>
Date:   Mon Mar 12 02:50:51 2012 -0500

    iscsi tools: remove class version check
    
    This patch removes the check for the transport class version.
    We have not used it, and instead have checked for kernel
    functionality on a per operation basis.

diff --git a/usr/iscsi_sysfs.c b/usr/iscsi_sysfs.c
index 984ea95..2ec5f69 100644
--- a/usr/iscsi_sysfs.c
+++ b/usr/iscsi_sysfs.c
@@ -1375,40 +1375,3 @@ char *iscsi_sysfs_get_iscsi_kernel_version(void)
 {
 	return sysfs_attr_get_value("/module/scsi_transport_iscsi", "version");
 }
-
-int iscsi_sysfs_check_class_version(void)
-{
-	char *version;
-	int i;
-
-	version = iscsi_sysfs_get_iscsi_kernel_version();
-	if (!version)
-		goto fail;
-
-	log_warning("transport class version %s. iscsid version %s",
-		    version, ISCSI_VERSION_STR);
-
-	for (i = 0; i < strlen(version); i++) {
-		if (version[i] == '-')
-			break;
-	}
-
-	if (i == strlen(version))
-		goto fail;
-
-	/*
-	 * We want to make sure the release and interface are the same.
-	 * It is ok for the svn versions to be different.
-	 */
-	if (!strncmp(version, ISCSI_VERSION_STR, i) ||
-	   /* support 2.6.18 */
-	    !strncmp(version, "1.1", 3))
-		return 0;
-
-fail:
-	log_error( "Missing or Invalid version from %s. Make sure a up "
-		"to date scsi_transport_iscsi module is loaded and a up to"
-		"date version of iscsid is running. Exiting...",
-		ISCSI_VERSION_FILE);
-	return -1;
-}
diff --git a/usr/iscsi_sysfs.h b/usr/iscsi_sysfs.h
index d1ce6cb..bae52b0 100644
--- a/usr/iscsi_sysfs.h
+++ b/usr/iscsi_sysfs.h
@@ -36,7 +36,6 @@ struct iscsi_auth_config;
 
 extern void free_transports(void);
 extern char *iscsi_sysfs_get_iscsi_kernel_version(void);
-extern int iscsi_sysfs_check_class_version(void);
 extern int iscsi_sysfs_get_sessioninfo_by_id(struct session_info *info,
 					     char *sys_session);
 extern int iscsi_sysfs_session_has_leadconn(uint32_t sid);
diff --git a/usr/iscsid.c b/usr/iscsid.c
index 215652a..b4bb65b 100644
--- a/usr/iscsid.c
+++ b/usr/iscsid.c
@@ -409,11 +409,6 @@ int main(int argc, char *argv[])
 		exit(ISCSI_ERR);
 	}
 
-	if (iscsi_sysfs_check_class_version()) {
-		log_close(log_pid);
-		exit(ISCSI_ERR);
-	}
-
 	umask(0177);
 
 	mgmt_ipc_fd = -1;
diff --git a/usr/iscsistart.c b/usr/iscsistart.c
index ef8b8e8..6ab8d6b 100644
--- a/usr/iscsistart.c
+++ b/usr/iscsistart.c
@@ -316,8 +316,6 @@ int main(int argc, char *argv[])
 	log_init(program_name, DEFAULT_AREA_SIZE, log_do_log_std, NULL);
 
 	sysfs_init();
-	if (iscsi_sysfs_check_class_version())
-		exit(ISCSI_ERR_SYSFS_LOOKUP);
 
 	while ((ch = getopt_long(argc, argv, "P:i:t:g:a:p:d:u:w:U:W:bNfvh",
 				 long_options, &longindex)) >= 0) {

-- 
Debian Open-iSCSI Packaging



More information about the Pkg-iscsi-maintainers mailing list