Commit b1fc7fe7 authored by Andrew Vasquez's avatar Andrew Vasquez Committed by James Bottomley

[PATCH] PATCH [11/15] qla2xxx: /proc fixes

  /proc file updates:

  	o Address 'unaligned access' message on ia64 platorms
  	  while displaying bit-field flags.

  	o Iterate through the the OS target array to display
  	  target ID bindings.

 drivers/scsi/qla2xxx/qla_os.c |   30 ++++++++++++------------------
 1 files changed, 12 insertions(+), 18 deletions(-)
parent 04b4e461
...@@ -2322,18 +2322,17 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer, ...@@ -2322,18 +2322,17 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer,
char **start, off_t offset, int length, int inout) char **start, off_t offset, int length, int inout)
{ {
struct info_str info; struct info_str info;
int i;
int retval = -EINVAL; int retval = -EINVAL;
os_lun_t *up; os_lun_t *up;
fc_port_t *fcport; os_tgt_t *tq;
unsigned int t, l; unsigned int t, l;
uint32_t tmp_sn; uint32_t tmp_sn;
unsigned long *flags; uint32_t *flags;
uint8_t *loop_state; uint8_t *loop_state;
int found; int found;
scsi_qla_host_t *ha; scsi_qla_host_t *ha;
char fw_info[30]; char fw_info[30];
DEBUG3(printk(KERN_INFO DEBUG3(printk(KERN_INFO
"Entering proc_info buff_in=%p, offset=0x%lx, length=0x%x\n", "Entering proc_info buff_in=%p, offset=0x%lx, length=0x%x\n",
buffer, offset, length);) buffer, offset, length);)
...@@ -2437,7 +2436,7 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer, ...@@ -2437,7 +2436,7 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer,
ha->done_q_cnt, ha->scsi_retry_q_cnt); ha->done_q_cnt, ha->scsi_retry_q_cnt);
flags = (unsigned long *) &ha->flags; flags = (uint32_t *) &ha->flags;
if (atomic_read(&ha->loop_state) == LOOP_DOWN) { if (atomic_read(&ha->loop_state) == LOOP_DOWN) {
loop_state = "DOWN"; loop_state = "DOWN";
...@@ -2511,24 +2510,19 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer, ...@@ -2511,24 +2510,19 @@ qla2x00_proc_info(struct Scsi_Host *shost, char *buffer,
ha->init_cb->port_name[7]); ha->init_cb->port_name[7]);
/* Print out device port names */ /* Print out device port names */
i = 0; for (t = 0; t < MAX_FIBRE_DEVICES; t++) {
list_for_each_entry(fcport, &ha->fcports, list) { if ((tq = TGT_Q(ha, t)) == NULL)
if (fcport->port_type != FCT_TARGET)
continue; continue;
copy_info(&info, copy_info(&info,
"scsi-qla%d-target-%d=" "scsi-qla%d-target-%d="
"%02x%02x%02x%02x%02x%02x%02x%02x:%02x%02x%02x;\n", "%02x%02x%02x%02x%02x%02x%02x%02x;\n",
(int)ha->instance, i, (int)ha->instance, t,
fcport->port_name[0], fcport->port_name[1], tq->port_name[0], tq->port_name[1],
fcport->port_name[2], fcport->port_name[3], tq->port_name[2], tq->port_name[3],
fcport->port_name[4], fcport->port_name[5], tq->port_name[4], tq->port_name[5],
fcport->port_name[6], fcport->port_name[7], tq->port_name[6], tq->port_name[7]);
fcport->d_id.b.domain, fcport->d_id.b.area,
fcport->d_id.b.al_pa);
i++;
} }
copy_info(&info, "\nSCSI LUN Information:\n"); copy_info(&info, "\nSCSI LUN Information:\n");
copy_info(&info, copy_info(&info,
"(Id:Lun) * - indicates lun is not registered with the OS.\n"); "(Id:Lun) * - indicates lun is not registered with the OS.\n");
......
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