Skip to content

L
linux
Commit 92c7a83f authored by Martin Peschke's avatar Martin Peschke Committed by James Bottomley
Browse files
Options

[SCSI] zfcp: Cleanup line breaks in debug trace. 

Remove line breaks that do not conform to coding style.
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 6bc473dd
Hide whitespace changes
Inline Side-by-side
Showing with 55 additions and 68 deletions
drivers/s390/scsi/zfcp_dbf.c
View file @ 92c7a83f
...@@ -110,9 +110,8 @@ static void zfcp_dbf_outd(char **p, const char *label, char *buffer, ...@@ -110,9 +110,8 @@ static void zfcp_dbf_outd(char **p, const char *label, char *buffer,
*p += sprintf(*p, "\n"); *p += sprintf(*p, "\n");
} }
static int static int zfcp_dbf_view_header(debug_info_t *id, struct debug_view *view,
zfcp_dbf_view_header(debug_info_t * id, struct debug_view *view, int area, int area, debug_entry_t *entry, char *out_buf)
debug_entry_t * entry, char *out_buf)
{ {
struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)DEBUG_DATA(entry); struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)DEBUG_DATA(entry);
struct timespec t; struct timespec t;
...@@ -137,7 +136,7 @@ void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *fsf_req) ...@@ -137,7 +136,7 @@ void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *fsf_req)
struct zfcp_adapter *adapter = fsf_req->adapter; struct zfcp_adapter *adapter = fsf_req->adapter;
struct fsf_qtcb *qtcb = fsf_req->qtcb; struct fsf_qtcb *qtcb = fsf_req->qtcb;
union fsf_prot_status_qual *prot_status_qual = union fsf_prot_status_qual *prot_status_qual =
&qtcb->prefix.prot_status_qual; &qtcb->prefix.prot_status_qual;
union fsf_status_qual *fsf_status_qual = &qtcb->header.fsf_status_qual; union fsf_status_qual *fsf_status_qual = &qtcb->header.fsf_status_qual;
struct scsi_cmnd *scsi_cmnd; struct scsi_cmnd *scsi_cmnd;
struct zfcp_port *port; struct zfcp_port *port;
...@@ -248,9 +247,8 @@ void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *fsf_req) ...@@ -248,9 +247,8 @@ void zfcp_hba_dbf_event_fsf_response(struct zfcp_fsf_req *fsf_req)
spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags); spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);
} }
void void zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter,
zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter, struct fsf_status_read_buffer *status_buffer)
struct fsf_status_read_buffer *status_buffer)
{ {
struct zfcp_hba_dbf_record *rec = &adapter->hba_dbf_buf; struct zfcp_hba_dbf_record *rec = &adapter->hba_dbf_buf;
unsigned long flags; unsigned long flags;
...@@ -301,10 +299,9 @@ zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter, ...@@ -301,10 +299,9 @@ zfcp_hba_dbf_event_fsf_unsol(const char *tag, struct zfcp_adapter *adapter,
spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags); spin_unlock_irqrestore(&adapter->hba_dbf_lock, flags);
} }
void void zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter, unsigned int status,
zfcp_hba_dbf_event_qdio(struct zfcp_adapter *adapter, unsigned int status, unsigned int qdio_error, unsigned int siga_error,
unsigned int qdio_error, unsigned int siga_error, int sbal_index, int sbal_count)
int sbal_index, int sbal_count)
{ {
struct zfcp_hba_dbf_record *r = &adapter->hba_dbf_buf; struct zfcp_hba_dbf_record *r = &adapter->hba_dbf_buf;
unsigned long flags; unsigned long flags;
...@@ -872,10 +869,10 @@ void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req) ...@@ -872,10 +869,10 @@ void zfcp_san_dbf_event_ct_response(struct zfcp_fsf_req *fsf_req)
spin_unlock_irqrestore(&adapter->san_dbf_lock, flags); spin_unlock_irqrestore(&adapter->san_dbf_lock, flags);
} }
static void static void zfcp_san_dbf_event_els(const char *tag, int level,
_zfcp_san_dbf_event_common_els(const char *tag, int level, struct zfcp_fsf_req *fsf_req, u32 s_id,
struct zfcp_fsf_req *fsf_req, u32 s_id, u32 d_id, u8 ls_code, void *buffer,
u32 d_id, u8 ls_code, void *buffer, int buflen) int buflen)
{ {
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;
...@@ -899,42 +896,39 @@ void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *fsf_req) ...@@ -899,42 +896,39 @@ void zfcp_san_dbf_event_els_request(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data; struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data;
_zfcp_san_dbf_event_common_els("oels", 2, fsf_req, zfcp_san_dbf_event_els("oels", 2, fsf_req,
fc_host_port_id(els->adapter->scsi_host), fc_host_port_id(els->adapter->scsi_host),
els->d_id, els->d_id, *(u8 *) zfcp_sg_to_address(els->req),
*(u8 *) zfcp_sg_to_address(els->req), zfcp_sg_to_address(els->req), els->req->length);
zfcp_sg_to_address(els->req),
els->req->length);
} }
void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *fsf_req) void zfcp_san_dbf_event_els_response(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data; struct zfcp_send_els *els = (struct zfcp_send_els *)fsf_req->data;
_zfcp_san_dbf_event_common_els("rels", 2, fsf_req, els->d_id, zfcp_san_dbf_event_els("rels", 2, fsf_req, els->d_id,
fc_host_port_id(els->adapter->scsi_host), fc_host_port_id(els->adapter->scsi_host),
*(u8 *) zfcp_sg_to_address(els->req), *(u8 *)zfcp_sg_to_address(els->req),
zfcp_sg_to_address(els->resp), zfcp_sg_to_address(els->resp),
els->resp->length); els->resp->length);
} }
void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *fsf_req) void zfcp_san_dbf_event_incoming_els(struct zfcp_fsf_req *fsf_req)
{ {
struct zfcp_adapter *adapter = fsf_req->adapter; struct zfcp_adapter *adapter = fsf_req->adapter;
struct fsf_status_read_buffer *status_buffer = struct fsf_status_read_buffer *buf =
(struct fsf_status_read_buffer *)fsf_req->data; (struct fsf_status_read_buffer *)fsf_req->data;
int length = (int)status_buffer->length - int length = (int)buf->length -
(int)((void *)&status_buffer->payload - (void *)status_buffer); (int)((void *)&buf->payload - (void *)buf);
_zfcp_san_dbf_event_common_els("iels", 1, fsf_req, status_buffer->d_id, zfcp_san_dbf_event_els("iels", 1, fsf_req, buf->d_id,
fc_host_port_id(adapter->scsi_host), fc_host_port_id(adapter->scsi_host),
*(u8 *) status_buffer->payload, *(u8 *)buf->payload, (void *)buf->payload,
(void *)status_buffer->payload, length); length);
} }
static int static int zfcp_san_dbf_view_format(debug_info_t *id, struct debug_view *view,
zfcp_san_dbf_view_format(debug_info_t * id, struct debug_view *view, char *out_buf, const char *in_buf)
char *out_buf, const char *in_buf)
{ {
struct zfcp_san_dbf_record *r = (struct zfcp_san_dbf_record *)in_buf; struct zfcp_san_dbf_record *r = (struct zfcp_san_dbf_record *)in_buf;
char *buffer = NULL; char *buffer = NULL;
...@@ -997,12 +991,11 @@ static struct debug_view zfcp_san_dbf_view = { ...@@ -997,12 +991,11 @@ static struct debug_view zfcp_san_dbf_view = {
NULL NULL
}; };
static void static void zfcp_scsi_dbf_event(const char *tag, const char *tag2, int level,
_zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, struct zfcp_adapter *adapter,
struct zfcp_adapter *adapter, struct scsi_cmnd *scsi_cmnd,
struct scsi_cmnd *scsi_cmnd, struct zfcp_fsf_req *fsf_req,
struct zfcp_fsf_req *fsf_req, unsigned long old_req_id)
unsigned long old_req_id)
{ {
struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf; struct zfcp_scsi_dbf_record *rec = &adapter->scsi_dbf_buf;
struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec; struct zfcp_dbf_dump *dump = (struct zfcp_dbf_dump *)rec;
...@@ -1076,39 +1069,33 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level, ...@@ -1076,39 +1069,33 @@ _zfcp_scsi_dbf_event_common(const char *tag, const char *tag2, int level,
spin_unlock_irqrestore(&adapter->scsi_dbf_lock, flags); spin_unlock_irqrestore(&adapter->scsi_dbf_lock, flags);
} }
void void zfcp_scsi_dbf_event_result(const char *tag, int level,
zfcp_scsi_dbf_event_result(const char *tag, int level, struct zfcp_adapter *adapter,
struct zfcp_adapter *adapter, struct scsi_cmnd *scsi_cmnd,
struct scsi_cmnd *scsi_cmnd, struct zfcp_fsf_req *fsf_req)
struct zfcp_fsf_req *fsf_req)
{ {
_zfcp_scsi_dbf_event_common("rslt", tag, level, zfcp_scsi_dbf_event("rslt", tag, level, adapter, scsi_cmnd, fsf_req, 0);
adapter, scsi_cmnd, fsf_req, 0);
} }
void void zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter,
zfcp_scsi_dbf_event_abort(const char *tag, struct zfcp_adapter *adapter, struct scsi_cmnd *scsi_cmnd,
struct scsi_cmnd *scsi_cmnd, struct zfcp_fsf_req *new_fsf_req,
struct zfcp_fsf_req *new_fsf_req, unsigned long old_req_id)
unsigned long old_req_id)
{ {
_zfcp_scsi_dbf_event_common("abrt", tag, 1, zfcp_scsi_dbf_event("abrt", tag, 1, adapter, scsi_cmnd, new_fsf_req,
adapter, scsi_cmnd, new_fsf_req, old_req_id); old_req_id);
} }
void void zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag,
zfcp_scsi_dbf_event_devreset(const char *tag, u8 flag, struct zfcp_unit *unit, struct zfcp_unit *unit,
struct scsi_cmnd *scsi_cmnd) struct scsi_cmnd *scsi_cmnd)
{ {
struct zfcp_adapter *adapter = unit->port->adapter; zfcp_scsi_dbf_event(flag == FCP_TARGET_RESET ? "trst" : "lrst", tag, 1,
unit->port->adapter, scsi_cmnd, NULL, 0);
_zfcp_scsi_dbf_event_common(flag == FCP_TARGET_RESET ? "trst" : "lrst",
tag, 1, adapter, scsi_cmnd, NULL, 0);
} }
static int static int zfcp_scsi_dbf_view_format(debug_info_t *id, struct debug_view *view,
zfcp_scsi_dbf_view_format(debug_info_t * id, struct debug_view *view, char *out_buf, const char *in_buf)
char *out_buf, const char *in_buf)
{ {
struct zfcp_scsi_dbf_record *r = (struct zfcp_scsi_dbf_record *)in_buf; struct zfcp_scsi_dbf_record *r = (struct zfcp_scsi_dbf_record *)in_buf;
struct timespec t; struct timespec t;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment
GitLab Nexedi Edition | About GitLab | About Nexedi | 沪ICP备2021021310号-2 | 沪ICP备2021021310号-7