svn commit: r288726 - in stable/10: sys/cam/ctl usr.sbin/ctladm usr.sbin/ctld

[Alexander Motin]

Author: mav
Date: Mon Oct  5 08:50:15 2015
New Revision: 288726
URL: https://svnweb.freebsd.org/changeset/base/288726

Log:
  MFC r287455, r287458, r287459: Remove some dead code.

Deleted:
  stable/10/sys/cam/ctl/ctl_backend_block.h
Modified:
  stable/10/sys/cam/ctl/README.ctl.txt
  stable/10/sys/cam/ctl/ctl_backend_block.c
  stable/10/usr.sbin/ctladm/ctladm.c
  stable/10/usr.sbin/ctld/kernel.c
Directory Properties:
  stable/10/   (props changed)

Modified: stable/10/sys/cam/ctl/README.ctl.txt
==============================================================================
--- stable/10/sys/cam/ctl/README.ctl.txt	Mon Oct  5 08:48:47 2015	(r288725)
+++ stable/10/sys/cam/ctl/README.ctl.txt	Mon Oct  5 08:50:15 2015	(r288726)
@@ -318,7 +318,6 @@ These files define the basic CTL backend
 explain the API.
 
 ctl_backend_block.c
-ctl_backend_block.h:
 -------------------
 
 The block and file backend.  This allows for using a disk or a file as the

Modified: stable/10/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- stable/10/sys/cam/ctl/ctl_backend_block.c	Mon Oct  5 08:48:47 2015	(r288725)
+++ stable/10/sys/cam/ctl/ctl_backend_block.c	Mon Oct  5 08:50:15 2015	(r288726)
@@ -156,7 +156,6 @@ typedef uint64_t (*cbb_getattr_t)(struct
  */
 struct ctl_be_block_lun {
 	struct ctl_lun_create_params params;
-	struct ctl_block_disk *disk;
 	char lunname[32];
 	char *dev_path;
 	ctl_be_block_type dev_type;
@@ -198,8 +197,6 @@ struct ctl_be_block_lun {
  */
 struct ctl_be_block_softc {
 	struct mtx			 lock;
-	int				 num_disks;
-	STAILQ_HEAD(, ctl_block_disk)	 disk_list;
 	int				 num_luns;
 	STAILQ_HEAD(, ctl_be_block_lun)	 lun_list;
 };
@@ -2920,7 +2917,6 @@ ctl_be_block_init(void)
 	mtx_init(&softc->lock, "ctlblock", NULL, MTX_DEF);
 	beio_zone = uma_zcreate("beio", sizeof(struct ctl_be_block_io),
 	    NULL, NULL, NULL, NULL, UMA_ALIGN_PTR, 0);
-	STAILQ_INIT(&softc->disk_list);
 	STAILQ_INIT(&softc->lun_list);
 
 	return (retval);

Modified: stable/10/usr.sbin/ctladm/ctladm.c
==============================================================================
--- stable/10/usr.sbin/ctladm/ctladm.c	Mon Oct  5 08:48:47 2015	(r288725)
+++ stable/10/usr.sbin/ctladm/ctladm.c	Mon Oct  5 08:50:15 2015	(r288726)
@@ -68,7 +68,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/ctl/ctl_io.h>
 #include <cam/ctl/ctl_backend.h>
 #include <cam/ctl/ctl_ioctl.h>
-#include <cam/ctl/ctl_backend_block.h>
 #include <cam/ctl/ctl_util.h>
 #include <cam/ctl/ctl_scsi_all.h>
 #include <camlib.h>

Modified: stable/10/usr.sbin/ctld/kernel.c
==============================================================================
--- stable/10/usr.sbin/ctld/kernel.c	Mon Oct  5 08:48:47 2015	(r288725)
+++ stable/10/usr.sbin/ctld/kernel.c	Mon Oct  5 08:50:15 2015	(r288726)
@@ -62,7 +62,6 @@ __FBSDID("$FreeBSD$");
 #include <cam/ctl/ctl_io.h>
 #include <cam/ctl/ctl_backend.h>
 #include <cam/ctl/ctl_ioctl.h>
-#include <cam/ctl/ctl_backend_block.h>
 #include <cam/ctl/ctl_util.h>
 #include <cam/ctl/ctl_scsi_all.h>