[patch 0/2] zfcp patches for 2.6.34-rc

[patch 0/2] zfcp patches for 2.6.34-rc

[Christof Schmitt]

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

[patch 1/2] zfcp: Update MAINTAINERS entry

[Christof Schmitt]

[-- Attachment #1: 700-zfcp-update-maintainers.diff --]
[-- Type: text/plain, Size: 993 bytes --]

From: Christof Schmitt <christof.schmitt@de.ibm.com>

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.

Cc: Martin Peschke <mp3@de.ibm.com>
Cc: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
---

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

--- a/MAINTAINERS	2010-04-01 12:17:08.000000000 +0200
+++ b/MAINTAINERS	2010-04-01 12:22:54.000000000 +0200
@@ -4776,12 +4776,11 @@ F:	drivers/s390/crypto/
 
 S390 ZFCP DRIVER
 M:	Christof Schmitt <christof.schmitt@de.ibm.com>
-M:	Martin Peschke <mp3@de.ibm.com>
+M:	Swen Schillig <swen@vnet.ibm.com>
 M:	linux390@de.ibm.com
 L:	linux-s390@vger.kernel.org
 W:	http://www.ibm.com/developerworks/linux/linux390/
 S:	Supported
-F:	Documentation/s390/zfcpdump.txt
 F:	drivers/s390/scsi/zfcp_*
 
 S390 IUCV NETWORK LAYER

[patch 2/2] zfcp: Fix tracing of requests with error status

[Christof Schmitt]

[-- Attachment #1: 703-zfcp-request-tracing.diff --]
[-- Type: text/plain, Size: 1533 bytes --]

From: Christof Schmitt <christof.schmitt@de.ibm.com>

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.

Reviewed-by: Swen Schillig <swen@vnet.ibm.com>
Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
---

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

--- a/drivers/s390/scsi/zfcp_fsf.c	2010-04-01 12:23:11.000000000 +0200
+++ b/drivers/s390/scsi/zfcp_fsf.c	2010-04-01 12:23:12.000000000 +0200
@@ -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;

Re: [patch 1/2] zfcp: Update MAINTAINERS entry

[Martin Peschke]

confirmed

Cheers,
Martin

On Thu, 2010-04-01 at 13:04 +0200, Christof Schmitt wrote:
> plain text document attachment (700-zfcp-update-maintainers.diff)
> From: Christof Schmitt <christof.schmitt@de.ibm.com>
> 
> 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.
> 
> Cc: Martin Peschke <mp3@de.ibm.com>
> Cc: Swen Schillig <swen@vnet.ibm.com>
> Signed-off-by: Christof Schmitt <christof.schmitt@de.ibm.com>
> ---
> 
>  MAINTAINERS |    3 +--
>  1 file changed, 1 insertion(+), 2 deletions(-)
> 
> --- a/MAINTAINERS	2010-04-01 12:17:08.000000000 +0200
> +++ b/MAINTAINERS	2010-04-01 12:22:54.000000000 +0200
> @@ -4776,12 +4776,11 @@ F:	drivers/s390/crypto/
> 
>  S390 ZFCP DRIVER
>  M:	Christof Schmitt <christof.schmitt@de.ibm.com>
> -M:	Martin Peschke <mp3@de.ibm.com>
> +M:	Swen Schillig <swen@vnet.ibm.com>
>  M:	linux390@de.ibm.com
>  L:	linux-s390@vger.kernel.org
>  W:	http://www.ibm.com/developerworks/linux/linux390/
>  S:	Supported
> -F:	Documentation/s390/zfcpdump.txt
>  F:	drivers/s390/scsi/zfcp_*
> 
>  S390 IUCV NETWORK LAYER
>