From: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Subject: [PATCH] vmevent: pass right attribute to vmevent_sample_attr()
Pass "config attribute" (&watch->config->attrs[i]) not "sample
attribute" (&watch->sample_attrs[i]) to vmevent_sample_attr() to
allow use of the original attribute value in vmevent_attr_sample_fn().
Cc: Anton Vorontsov <anton.vorontsov@xxxxxxxxxx>
Signed-off-by: Bartlomiej Zolnierkiewicz <b.zolnierkie@xxxxxxxxxxx>
Signed-off-by: Kyungmin Park <kyungmin.park@xxxxxxxxxxx>
---
Without this patch vmevent_attr_lowmem_pages() always returns 0.
mm/vmevent.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
Index: b/mm/vmevent.c
===================================================================
--- a/mm/vmevent.c 2012-05-22 17:55:02.000000000 +0200
+++ b/mm/vmevent.c 2012-05-22 18:10:40.075231798 +0200
@@ -31,6 +31,7 @@
*/
unsigned long nr_attrs;
struct vmevent_attr *sample_attrs;
+ struct vmevent_attr *config_attrs[VMEVENT_CONFIG_MAX_ATTRS];
/* sampling */
struct timer_list timer;
@@ -104,6 +105,7 @@
*/
if (free < val && file < val)
return val;
+
return 0;
}
@@ -210,7 +212,8 @@
for (i = 0; i < watch->nr_attrs; i++) {
struct vmevent_attr *attr = &watch->sample_attrs[i];
- attr->value = vmevent_sample_attr(watch, attr);
+ attr->value = vmevent_sample_attr(watch,
+ watch->config_attrs[i]);
}
atomic_set(&watch->pending, 1);
@@ -353,6 +356,9 @@
attrs[nr].type = attr->type;
attrs[nr].value = 0;
attrs[nr].state = 0;
+
+ watch->config_attrs[nr] = attr;
+
nr++;
}
--
To unsubscribe, send a message with 'unsubscribe linux-mm' in
the body to majordomo@xxxxxxxxx. For more info on Linux MM,
see: http://www.linux-mm.org/ .
Fight unfair telecom internet charges in Canada: sign http://stopthemeter.ca/
Don't email: <a href=mailto:"dont@xxxxxxxxx";> email@xxxxxxxxx </a>