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

Commit 0f65e951 authored by Martin Peschke's avatar Martin Peschke Committed by James Bottomley
Browse files

[SCSI] zfcp: Clean up _zfcp_san_dbf_event_common_els 



Clean up _zfcp_san_dbf_event_common_els using zfcp_dbf_hexdump()
helper.

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 c15450e3

drivers/s390/scsi/zfcp_dbf.c

+10 −29
Original line number Original line Diff line number Diff line
@@ -562,38 +562,19 @@ _zfcp_san_dbf_event_common_els(const char *tag, int level, 
{

{

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_adapter *adapter = fsf_req->adapter;

	struct zfcp_san_dbf_record *rec = &adapter->san_dbf_buf;

	struct zfcp_san_dbf_record *rec = &adapter->san_dbf_buf;

	struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec;

	unsigned long flags;

	unsigned long flags;

	int offset = 0;





	spin_lock_irqsave(&adapter->san_dbf_lock, flags);

	spin_lock_irqsave(&adapter->san_dbf_lock, flags);

	do {

	memset(rec, 0, sizeof(struct zfcp_san_dbf_record));

	memset(rec, 0, sizeof(struct zfcp_san_dbf_record));

		if (offset == 0) {

	strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE);

	strncpy(rec->tag, tag, ZFCP_DBF_TAG_SIZE);

	rec->fsf_reqid = (unsigned long)fsf_req;

	rec->fsf_reqid = (unsigned long)fsf_req;

	rec->fsf_seqno = fsf_req->seq_no;

	rec->fsf_seqno = fsf_req->seq_no;

	rec->s_id = s_id;

	rec->s_id = s_id;

	rec->d_id = d_id;

	rec->d_id = d_id;

	rec->type.els.ls_code = ls_code;

	rec->type.els.ls_code = ls_code;

			buflen = min(buflen, ZFCP_DBF_ELS_MAX_PAYLOAD);

	debug_event(adapter->san_dbf, level, rec, sizeof(*rec));

			rec->type.els.payload_size = buflen;

	zfcp_dbf_hexdump(adapter->san_dbf, rec, sizeof(*rec), level,

			memcpy(rec->type.els.payload,

			 buffer, min(buflen, ZFCP_DBF_ELS_MAX_PAYLOAD));

			       buffer, min(buflen, ZFCP_DBF_ELS_PAYLOAD));

			offset += min(buflen, ZFCP_DBF_ELS_PAYLOAD);

		} else {

			strncpy(dump->tag, "dump", ZFCP_DBF_TAG_SIZE);

			dump->total_size = buflen;

			dump->offset = offset;

			dump->size = min(buflen - offset,

					 (int)sizeof(struct zfcp_san_dbf_record)

					 - (int)sizeof(struct zfcp_dbf_dump));

			memcpy(dump->data, buffer + offset, dump->size);

			offset += dump->size;

		}

		debug_event(adapter->san_dbf, level,

			    rec, sizeof(struct zfcp_san_dbf_record));

	} while (offset < buflen);

	spin_unlock_irqrestore(&adapter->san_dbf_lock, flags);

	spin_unlock_irqrestore(&adapter->san_dbf_lock, flags);

}

}