* [patch 0/1] One more zfcp fix for 2.6.33-rc
@ 2010-01-26 16:49 Christof Schmitt
2010-01-26 16:49 ` [patch 1/1] zfcp: Report FC BSG errors in correct field Christof Schmitt
0 siblings, 1 reply; 2+ messages in thread
From: Christof Schmitt @ 2010-01-26 16:49 UTC (permalink / raw
To: James Bottomley; +Cc: linux-scsi, linux-s390, schwidefsky, heiko.carstens
James,
here is one more fix for zfcp in the current 2.6.33-rc cycle. The
patch applies to the current scsi-rc-fixes tree.
We missed that problem in the last round of bsg fixes in zfcp, i hope
this is the last one.
--
Christof Schmitt
^ permalink raw reply [flat|nested] 2+ messages in thread
* [patch 1/1] zfcp: Report FC BSG errors in correct field
2010-01-26 16:49 [patch 0/1] One more zfcp fix for 2.6.33-rc Christof Schmitt
@ 2010-01-26 16:49 ` Christof Schmitt
0 siblings, 0 replies; 2+ messages in thread
From: Christof Schmitt @ 2010-01-26 16:49 UTC (permalink / raw
To: James Bottomley
Cc: linux-scsi, linux-s390, schwidefsky, heiko.carstens,
Swen Schillig, Christof Schmitt
[-- Attachment #1: 711-zfcp-status-variable.diff --]
[-- Type: text/plain, Size: 1518 bytes --]
From: Swen Schillig <swen@vnet.ibm.com>
The status FC_CTELS_STATUS_REJECT for all FC BSG errors is not
appropriate. Instead, report -EIO in the result field if there was a
problem in zfcp with the FC BSG request. If the request is good from
our point of view, report result 0, status FC_CTELS_STATUS_OK and let
userspace read the Accept or Reject from the payload (as documented in
scsi_bsg_fc.h).
Signed-off-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
---
drivers/s390/scsi/zfcp_fc.c | 9 ++++-----
1 file changed, 4 insertions(+), 5 deletions(-)
diff -urpN linux-2.6/drivers/s390/scsi/zfcp_fc.c linux-2.6-patched/drivers/s390/scsi/zfcp_fc.c
--- linux-2.6/drivers/s390/scsi/zfcp_fc.c 2010-01-26 09:36:54.000000000 +0100
+++ linux-2.6-patched/drivers/s390/scsi/zfcp_fc.c 2010-01-26 09:36:54.000000000 +0100
@@ -671,12 +671,11 @@ static void zfcp_fc_ct_els_job_handler(v
{
struct fc_bsg_job *job = data;
struct zfcp_fsf_ct_els *zfcp_ct_els = job->dd_data;
- int status = zfcp_ct_els->status;
- int reply_status;
+ struct fc_bsg_reply *jr = job->reply;
- reply_status = status ? FC_CTELS_STATUS_REJECT : FC_CTELS_STATUS_OK;
- job->reply->reply_data.ctels_reply.status = reply_status;
- job->reply->reply_payload_rcv_len = job->reply_payload.payload_len;
+ jr->reply_payload_rcv_len = job->reply_payload.payload_len;
+ jr->reply_data.ctels_reply.status = FC_CTELS_STATUS_OK;
+ jr->result = zfcp_ct_els->status ? -EIO : 0;
job->job_done(job);
}
^ permalink raw reply [flat|nested] 2+ messages in thread
end of thread, other threads:[~2010-01-26 16:52 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2010-01-26 16:49 [patch 0/1] One more zfcp fix for 2.6.33-rc Christof Schmitt
2010-01-26 16:49 ` [patch 1/1] zfcp: Report FC BSG errors in correct field Christof Schmitt
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 read-only IMAP folder(s) and NNTP newsgroup(s).