Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 507e4969 authored by Martin Peschke's avatar Martin Peschke Committed by James Bottomley
Browse files

[SCSI] zfcp: Remove obsolete erp_dbf trace 



This patch removes the now obsolete erp_dbf trace.

Signed-off-by: default avatarMartin Peschke <mp3@de.ibm.com>
Signed-off-by: default avatarChristof Schmitt <christof.schmitt@de.ibm.com>
Signed-off-by: default avatarJames Bottomley <James.Bottomley@HansenPartnership.com>
parent 6f4f365e

drivers/s390/scsi/zfcp_aux.c

+0 −1
Original line number Diff line number Diff line
@@ -1030,7 +1030,6 @@ zfcp_adapter_enqueue(struct ccw_device *ccw_device) 


	/* initialize debug locks */



	spin_lock_init(&adapter->erp_dbf_lock);

	spin_lock_init(&adapter->hba_dbf_lock);

	spin_lock_init(&adapter->san_dbf_lock);

	spin_lock_init(&adapter->scsi_dbf_lock);

drivers/s390/scsi/zfcp_ccw.c

+0 −3
Original line number Diff line number Diff line
@@ -223,19 +223,16 @@ zfcp_ccw_notify(struct ccw_device *ccw_device, int event) 
	case CIO_GONE:

		ZFCP_LOG_NORMAL("adapter %s: device gone\n",

				zfcp_get_busid_by_adapter(adapter));

		debug_text_event(adapter->erp_dbf,1,"dev_gone");

		zfcp_erp_adapter_shutdown(adapter, 0, 87, 0);

		break;

	case CIO_NO_PATH:

		ZFCP_LOG_NORMAL("adapter %s: no path\n",

				zfcp_get_busid_by_adapter(adapter));

		debug_text_event(adapter->erp_dbf,1,"no_path");

		zfcp_erp_adapter_shutdown(adapter, 0, 88, 0);

		break;

	case CIO_OPER:

		ZFCP_LOG_NORMAL("adapter %s: operational again\n",

				zfcp_get_busid_by_adapter(adapter));

		debug_text_event(adapter->erp_dbf,1,"dev_oper");

		zfcp_erp_modify_adapter_status(adapter, 11, 0,

					       ZFCP_STATUS_COMMON_RUNNING,

					       ZFCP_SET);

drivers/s390/scsi/zfcp_dbf.c

+0 −11
Original line number Diff line number Diff line
@@ -1301,15 +1301,6 @@ int zfcp_adapter_debug_register(struct zfcp_adapter *adapter) 
{

	char dbf_name[DEBUG_MAX_NAME_LEN];



	/* debug feature area which records recovery activity */

	sprintf(dbf_name, "zfcp_%s_erp", zfcp_get_busid_by_adapter(adapter));

	adapter->erp_dbf = debug_register(dbf_name, dbfsize, 2,

					  sizeof(struct zfcp_erp_dbf_record));

	if (!adapter->erp_dbf)

		goto failed;

	debug_register_view(adapter->erp_dbf, &debug_hex_ascii_view);

	debug_set_level(adapter->erp_dbf, 3);



	/* debug feature area which records recovery activity */

	sprintf(dbf_name, "zfcp_%s_rec", zfcp_get_busid_by_adapter(adapter));

	adapter->rec_dbf = debug_register(dbf_name, dbfsize, 1,
@@ -1368,12 +1359,10 @@ void zfcp_adapter_debug_unregister(struct zfcp_adapter *adapter) 
	debug_unregister(adapter->san_dbf);

	debug_unregister(adapter->hba_dbf);

	debug_unregister(adapter->rec_dbf);

	debug_unregister(adapter->erp_dbf);

	adapter->scsi_dbf = NULL;

	adapter->san_dbf = NULL;

	adapter->hba_dbf = NULL;

	adapter->rec_dbf = NULL;

	adapter->erp_dbf = NULL;

}



#undef ZFCP_LOG_AREA

drivers/s390/scsi/zfcp_def.h

+0 −8
Original line number Diff line number Diff line
@@ -274,11 +274,6 @@ struct zfcp_dbf_dump { 
	u8 data[];		/* dump data */

} __attribute__ ((packed));



/* FIXME: to be inflated when reworking the erp dbf */

struct zfcp_erp_dbf_record {

	u8 dummy[16];

} __attribute__ ((packed));



struct zfcp_rec_dbf_record_thread {

	u32 sema;

	u32 total;
@@ -969,17 +964,14 @@ struct zfcp_adapter { 
	u32			erp_low_mem_count; /* nr of erp actions waiting

						      for memory */

	struct zfcp_port	*nameserver_port;  /* adapter's nameserver */

	debug_info_t		*erp_dbf;

	debug_info_t		*rec_dbf;

	debug_info_t		*hba_dbf;

	debug_info_t		*san_dbf;          /* debug feature areas */

	debug_info_t		*scsi_dbf;

	spinlock_t		erp_dbf_lock;

	spinlock_t		rec_dbf_lock;

	spinlock_t		hba_dbf_lock;

	spinlock_t		san_dbf_lock;

	spinlock_t		scsi_dbf_lock;

	struct zfcp_erp_dbf_record	erp_dbf_buf;

	struct zfcp_rec_dbf_record	rec_dbf_buf;

	struct zfcp_hba_dbf_record	hba_dbf_buf;

	struct zfcp_san_dbf_record	san_dbf_buf;

drivers/s390/scsi/zfcp_erp.c

+4 −301

File changed.

Preview size limit exceeded, changes collapsed.