zfcp patches for 2.6.34-rc

James,

here are two zfcp patches for 2.6.34-rc. One updates the MAINTAINERS entry for zfcp and the other one fixes a bug in the request tracing. Both patches apply cleanly on top of the current scsi-rc-fixes git tree.

--
Christof

From: Christof Schmitt <[email protected]>

Martin no longer works on zfcp, remove his entry from the MAINTAINERS file and add Swen as co-maintainer.

Also remove the reference to the zfcpdump.txt file, zfcpdump is not part of the zfcp device driver.

---

 MAINTAINERS |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

@@ -4776,12 +4776,11 @@ F:	drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 M:	Christof Schmitt <[email protected]>
-M:	Martin Peschke <[email protected]>
+M:	Swen Schillig <[email protected]>
 M:	[email protected]
 L:	[email protected]
 W:	http://www.ibm.com/developerworks/linux/linux390/
 S:	Supported
-F:	Documentation/s390/zfcpdump.txt
 F:	drivers/s390/scsi/zfcp_*
 
 S390 IUCV NETWORK LAYER

confirmed

Cheers,
Martin

From: Christof Schmitt <[email protected]>

When a FSF request is returned with an error it should be reported through blktrace for the ziomon tools, but the latency information should not be read. Fix this by also calling zfcp_fsf_req_trace for the error case, but skip reading the latencies inside the function.

---

 drivers/s390/scsi/zfcp_fsf.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

@@ -2104,7 +2104,8 @@ static void zfcp_fsf_req_trace(struct zf
 	blktrc.inb_usage = req->qdio_req.qdio_inb_usage;
 	blktrc.outb_usage = req->qdio_req.qdio_outb_usage;
 
-	if (req->adapter->adapter_features & FSF_FEATURE_MEASUREMENT_DATA) {
+	if (req->adapter->adapter_features & FSF_FEATURE_MEASUREMENT_DATA &&
+	    !(req->status & ZFCP_STATUS_FSFREQ_ERROR)) {
 		blktrc.flags |= ZFCP_BLK_LAT_VALID;
 		blktrc.channel_lat = lat_in->channel_lat * ticks;
 		blktrc.fabric_lat = lat_in->fabric_lat * ticks;

@@ -2156,9 +2157,8 @@ static void zfcp_fsf_send_fcp_command_ta
 	fcp_rsp = (struct fcp_resp_with_ext *) &req->qtcb->bottom.io.fcp_rsp;
 	zfcp_fc_eval_fcp_rsp(fcp_rsp, scpnt);
 
-	zfcp_fsf_req_trace(req, scpnt);
-
 skip_fsfstatus:
+	zfcp_fsf_req_trace(req, scpnt);
 	zfcp_dbf_scsi_result(req->adapter->dbf, scpnt, req);
 
 	scpnt->host_scribble = NULL;