From: Jeff Garzik <jgarzik@pobox.com>
To: linux-scsi@vger.kernel.org
Subject: [PATCH RFC 3/2] HCIL driver update: lpfc
Date: Sun, 23 Oct 2005 16:12:32 -0400 [thread overview]
Message-ID: <20051023201232.GA12931@havoc.gtf.org> (raw)
In-Reply-To: <20051023195128.GA12102@havoc.gtf.org>
Applied on top of the previous two driver update patches.
Since lpfc already uses dev_printk, we can simply drop references to
sdev->lun and sdev->id altogether.
DO NOT APPLY.
drivers/scsi/lpfc/lpfc_scsi.c | 31 +++++++------------------------
1 files changed, 7 insertions(+), 24 deletions(-)
diff --git a/drivers/scsi/lpfc/lpfc_scsi.c b/drivers/scsi/lpfc/lpfc_scsi.c
index a162174..b1202a6 100644
--- a/drivers/scsi/lpfc/lpfc_scsi.c
+++ b/drivers/scsi/lpfc/lpfc_scsi.c
@@ -370,7 +370,6 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba
struct lpfc_nodelist *pnode = rdata->pnode;
struct scsi_cmnd *cmd = lpfc_cmd->pCmd;
unsigned long iflag;
- char lunstr[SCSILUN_STR_LEN];
lpfc_cmd->result = pIocbOut->iocb.un.ulpWord[4];
lpfc_cmd->status = pIocbOut->iocb.ulpStatus;
@@ -383,10 +382,9 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba
lpfc_cmd->status = IOSTAT_DEFAULT;
lpfc_printf_log(phba, KERN_WARNING, LOG_FCP,
- "%d:0729 FCP cmd x%x failed <%d/%s> status: "
+ "0729 FCP cmd x%x failed status: "
"x%x result: x%x Data: x%x x%x\n",
- phba->brd_no, cmd->cmnd[0], sdev_id(cmd->device),
- scsilun_to_str(&cmd->device->lun, lunstr),
+ cmd->cmnd[0],
lpfc_cmd->status,
lpfc_cmd->result, pIocbOut->iocb.ulpContext,
lpfc_cmd->cur_iocbq.iocb.ulpIoTag);
@@ -421,10 +419,8 @@ lpfc_scsi_cmd_iocb_cmpl(struct lpfc_hba
uint32_t *lp = (uint32_t *)cmd->sense_buffer;
lpfc_printf_log(phba, KERN_INFO, LOG_FCP,
- "%d:0710 Iodone <%d/%s> cmd %p, error x%x "
+ "0710 Iodone cmd %p, error x%x "
"SNS x%x x%x Data: x%x x%x\n",
- phba->brd_no, sdev_id(cmd->device),
- scsilun_to_str(&cmd->device->lun, lunstr),
cmd, cmd->result,
*lp, *(lp + 3), cmd->retries, cmd->resid);
}
@@ -540,7 +536,6 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc
struct scsi_device *scsi_dev = lpfc_cmd->pCmd->device;
struct lpfc_rport_data *rdata = scsi_dev->hostdata;
struct lpfc_nodelist *ndlp = rdata->pnode;
- char lunstr[SCSILUN_STR_LEN];
if ((ndlp == 0) || (ndlp->nlp_state != NLP_STE_MAPPED_NODE)) {
return 0;
@@ -581,11 +576,8 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc
lpfc_printf_log(phba,
KERN_INFO,
LOG_FCP,
- "%d:0703 Issue LUN Reset to TGT %d LUN %s "
+ "0703 Issue LUN Reset "
"Data: x%x x%x\n",
- phba->brd_no,
- sdev_id(scsi_dev),
- scsilun_to_str(&scsi_dev->lun, lunstr),
ndlp->nlp_rpi, ndlp->nlp_flag);
break;
@@ -594,11 +586,8 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc
lpfc_printf_log(phba,
KERN_INFO,
LOG_FCP,
- "%d:0701 Issue Abort Task Set to TGT %d LUN %s "
+ "0701 Issue Abort Task Set "
"Data: x%x x%x\n",
- phba->brd_no,
- sdev_id(scsi_dev),
- scsilun_to_str(&scsi_dev->lun, lunstr),
ndlp->nlp_rpi, ndlp->nlp_flag);
break;
@@ -607,10 +596,8 @@ lpfc_scsi_prep_task_mgmt_cmd(struct lpfc
lpfc_printf_log(phba,
KERN_INFO,
LOG_FCP,
- "%d:0702 Issue Target Reset to TGT %d "
+ "0702 Issue Target Reset "
"Data: x%x x%x\n",
- phba->brd_no,
- sdev_id(scsi_dev),
ndlp->nlp_rpi,
ndlp->nlp_flag);
break;
@@ -953,7 +940,6 @@ __lpfc_reset_lun_handler(struct scsi_cmn
struct lpfc_nodelist *pnode = rdata->pnode;
int ret = FAILED;
int cnt, loopcnt;
- char lunstr[SCSILUN_STR_LEN];
/*
* If target is not in a MAPPED state, delay the reset until
@@ -1045,11 +1031,8 @@ __lpfc_reset_lun_handler(struct scsi_cmn
out_free_scsi_buf:
lpfc_printf_log(phba, KERN_ERR, LOG_FCP,
- "%d:0713 SCSI layer issued LUN reset (%d, %s) "
+ "0713 SCSI layer issued LUN reset "
"Data: x%x x%x x%x\n",
- phba->brd_no,
- sdev_id(lpfc_cmd->pCmd->device),
- scsilun_to_str(&lpfc_cmd->pCmd->device->lun, lunstr),
ret, lpfc_cmd->status,
lpfc_cmd->result);
lpfc_free_scsi_buf(lpfc_cmd);
next prev parent reply other threads:[~2005-10-23 20:12 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2005-10-23 2:41 [PATCH RFC] kill scsi_device::{channel,id} in generic code Jeff Garzik
2005-10-23 19:51 ` [PATCH RFC 1/2] HCIL drivers update Jeff Garzik
2005-10-23 19:52 ` [PATCH RFC 2/2] " Jeff Garzik
2005-10-23 20:12 ` Jeff Garzik [this message]
2005-10-23 21:40 ` [PATCH RFC 4/2] HCIL drivers update; sdev_printk Jeff Garzik
2005-10-24 3:36 ` James Bottomley
2005-10-24 4:01 ` Jeff Garzik
2005-10-24 0:13 ` [PATCH RFC 5/n] HCIL drivers update Jeff Garzik
2005-10-24 0:14 ` [PATCH RFC 6/n] " Jeff Garzik
2005-10-24 3:49 ` [PATCH RFC 7/n] " Jeff Garzik
2005-10-24 6:43 ` Stefan Richter
2005-10-24 3:52 ` [PATCH RFC 8/n] " Jeff Garzik
2005-10-24 5:14 ` [PATCH RFC 9/n] sfoo_printk stuff merges Jeff Garzik
2005-10-24 8:15 ` [PATCH RFC 10/n] HCIL drivers update Jeff Garzik
2005-10-24 8:16 ` [PATCH RFC 11/n] " Jeff Garzik
2005-10-24 8:17 ` [PATCH RFC 12/n] " Jeff Garzik
2005-10-24 8:18 ` [PATCH RFC 13/n] " Jeff Garzik
2005-10-24 17:41 ` [PATCH RFC 14/n] more dev_printk driver work Jeff Garzik
2005-10-24 18:00 ` [PATCH RFC 15/n] HCIL drivers update Jeff Garzik
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20051023201232.GA12931@havoc.gtf.org \
--to=jgarzik@pobox.com \
--cc=linux-scsi@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).