The patch titled
statistics infrastructure: update 4
has been removed from the -mm tree. Its filename is
statistics-infrastructure-update-4.patch
This patch was dropped because it was folded into statistics-infrastructure.patch
------------------------------------------------------
Subject: statistics infrastructure: update 4
From: Martin Peschke <mp3@xxxxxxxxxx>
This fixes an endless loop that might hang the statistics code when it is
parsing options. I assume it also fixes the soft lockup reported by Wu.
Signed-off-by: Martin Peschke <mp3@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
lib/statistic.c | 8 ++------
1 file changed, 2 insertions(+), 6 deletions(-)
diff -puN lib/statistic.c~statistics-infrastructure-update-4 lib/statistic.c
--- a/lib/statistic.c~statistics-infrastructure-update-4
+++ a/lib/statistic.c
@@ -721,12 +721,7 @@ static int statistic_def_close(struct in
for (offset = 0; offset < seg->offset; offset += seg_nl->size) {
seg_nl = kmalloc(sizeof(struct sgrb_seg), GFP_KERNEL);
if (unlikely(!seg_nl))
- /*
- * FIXME:
- * Should we omit other new settings because we
- * could not process this line of definitions?
- */
- continue;
+ goto out;
seg_nl->address = seg->address + offset;
nl = strnchr(seg_nl->address,
seg->offset - offset, '\n');
@@ -745,6 +740,7 @@ static int statistic_def_close(struct in
}
}
}
+out:
if (!list_empty(&line_lh))
statistic_parse(interface, &line_lh, line_size);
return statistic_generic_close(inode, file);
_
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-update-4.patch
statistics-infrastructure-update-5.patch
statistics-infrastructure-update-6.patch
statistics-infrastructure-update-7.patch
statistics-infrastructure-update-8.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
