svn commit: r287455 - head/sys/cam/ctl

Alexander Motin mav at FreeBSD.org
Fri Sep 4 09:19:02 UTC 2015


Author: mav
Date: Fri Sep  4 09:19:01 2015
New Revision: 287455
URL: https://svnweb.freebsd.org/changeset/base/287455

Log:
  Remove some dead code.

Deleted:
  head/sys/cam/ctl/ctl_backend_block.h
Modified:
  head/sys/cam/ctl/README.ctl.txt
  head/sys/cam/ctl/ctl_backend_block.c

Modified: head/sys/cam/ctl/README.ctl.txt
==============================================================================
--- head/sys/cam/ctl/README.ctl.txt	Fri Sep  4 08:04:12 2015	(r287454)
+++ head/sys/cam/ctl/README.ctl.txt	Fri Sep  4 09:19:01 2015	(r287455)
@@ -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: head/sys/cam/ctl/ctl_backend_block.c
==============================================================================
--- head/sys/cam/ctl/ctl_backend_block.c	Fri Sep  4 08:04:12 2015	(r287454)
+++ head/sys/cam/ctl/ctl_backend_block.c	Fri Sep  4 09:19:01 2015	(r287455)
@@ -154,7 +154,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;
@@ -196,8 +195,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;
 };
@@ -2906,7 +2903,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);


More information about the svn-src-all mailing list