The patch titled
statistics infrastructure: update 5
has been removed from the -mm tree. Its filename is
statistics-infrastructure-update-5-zfcp.patch
This patch was dropped because it was folded into statistics-infrastructure-exploitation-zfcp.patch
------------------------------------------------------
Subject: statistics infrastructure: update 5
From: Martin Peschke <mp3@xxxxxxxxxx>
This patch contains cleanups suggested by Greg KH. No functional changes.
- C99 field initializers in structures
- simplify loop in statistic_transition()
- slim down header file
- fix description of CONFIG_STATISTICS
- simplify statistic_inc() and statistic_inc_nolock()
- add a comment about the non-CONFIG_STATISTICS stuff in header file
Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
drivers/s390/scsi/zfcp_ccw.c | 24 ++++++++++++++++++++----
1 file changed, 20 insertions(+), 4 deletions(-)
diff -puN drivers/s390/scsi/zfcp_ccw.c~statistics-infrastructure-update-5-zfcp drivers/s390/scsi/zfcp_ccw.c
--- a/drivers/s390/scsi/zfcp_ccw.c~statistics-infrastructure-update-5-zfcp
+++ a/drivers/s390/scsi/zfcp_ccw.c
@@ -134,13 +134,29 @@ zfcp_ccw_remove(struct ccw_device *ccw_d
static struct statistic_info zfcp_statinfo_a[] = {
{ /* ZFCP_STAT_A_QOF */
- "qdio_outb_full", "sbals_left", "", 0, "type=counter_inc" },
+ .name = "qdio_outb_full",
+ .x_unit = "sbals_left",
+ .y_unit = "",
+ .defaults = "type=counter_inc"
+ },
{ /* ZFCP_STAT_A_QO */
- "qdio_outb", "sbals_used", "", 0, "type=utilisation" },
+ .name = "qdio_outb",
+ .x_unit = "sbals_used",
+ .y_unit = "",
+ .defaults = "type=utilisation"
+ },
{ /* ZFCP_STAT_A_QI */
- "qdio_inb", "sbals_used", "", 0, "type=utilisation" },
+ .name = "qdio_inb",
+ .x_unit = "sbals_used",
+ .y_unit = "",
+ .defaults = "type=utilisation"
+ },
{ /* ZFCP_STAT_A_ERP */
- "erp", "", "", 0, "type=counter_inc" }
+ .name = "erp",
+ .x_unit = "",
+ .y_unit = "",
+ .defaults = "type=counter_inc"
+ }
};
/**
_
Patches currently in -mm which might be from mp3@xxxxxxxxxx are
statistics-infrastructure-prerequisite-list.patch
statistics-infrastructure-prerequisite-parser.patch
statistics-infrastructure-prerequisite-timestamp.patch
statistics-infrastructure-prerequisite-timestamp-fix.patch
statistics-infrastructure-make-printk_clock-a-generic-kernel-wide-nsec-resolution.patch
statistics-infrastructure-documentation.patch
statistics-infrastructure.patch
statistics-infrastructure-exploitation-zfcp.patch
statistics-infrastructure-update-5-zfcp.patch
statistics-infrastructure-update-6-zfcp.patch
-
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
