The patch titled
readahead: debug radix tree new functions
has been removed from the -mm tree. Its filename was
readahead-debug-radix-tree-new-functions.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
Subject: readahead: debug radix tree new functions
From: Wu Fengguang <wfg@xxxxxxxxxxxxxxxx>
Do some sanity checkings on the newly added radix tree code.
Signed-off-by: Wu Fengguang <wfg@xxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxx>
---
mm/readahead.c | 19 +++++++++++++++++++
1 file changed, 19 insertions(+)
diff -puN mm/readahead.c~readahead-debug-radix-tree-new-functions mm/readahead.c
--- a/mm/readahead.c~readahead-debug-radix-tree-new-functions
+++ a/mm/readahead.c
@@ -77,6 +77,8 @@ enum ra_class {
RA_CLASS_COUNT
};
+#define DEBUG_READAHEAD_RADIXTREE
+
/* Read-ahead events to be accounted. */
enum ra_event {
RA_EVENT_CACHE_MISS, /* read cache misses */
@@ -1341,6 +1343,16 @@ static pgoff_t find_segtail(struct addre
cond_resched();
read_lock_irq(&mapping->tree_lock);
ra_index = radix_tree_scan_hole(&mapping->page_tree, index, max_scan);
+#ifdef DEBUG_READAHEAD_RADIXTREE
+ BUG_ON(!__probe_page(mapping, index));
+ WARN_ON(ra_index < index);
+ if (ra_index != index && !__probe_page(mapping, ra_index - 1))
+ printk(KERN_ERR "radix_tree_scan_hole(index=%lu ra_index=%lu "
+ "max_scan=%lu nrpages=%lu) fooled!\n",
+ index, ra_index, max_scan, mapping->nrpages);
+ if (ra_index != ~0UL && ra_index - index < max_scan)
+ WARN_ON(__probe_page(mapping, ra_index));
+#endif
read_unlock_irq(&mapping->tree_lock);
if (ra_index <= index + max_scan)
@@ -1424,6 +1436,13 @@ static unsigned long query_page_cache_se
read_lock_irq(&mapping->tree_lock);
index = radix_tree_scan_hole_backward(&mapping->page_tree,
offset - 1, ra_max);
+#ifdef DEBUG_READAHEAD_RADIXTREE
+ WARN_ON(index > offset - 1);
+ if (index != offset - 1)
+ WARN_ON(!__probe_page(mapping, index + 1));
+ if (index && offset - 1 - index < ra_max)
+ WARN_ON(__probe_page(mapping, index));
+#endif
*remain = (offset - 1) - index;
_
Patches currently in -mm which might be from wfg@xxxxxxxxxxxxxxxx are
readahead-debug-radix-tree-new-functions.patch
readahead-debug-traces-showing-accessed-file-names.patch
readahead-debug-traces-showing-read-patterns.patch
readahead-remove-size-limit-on-read_ahead_kb.patch
readahead-backward-prefetching-method-fix.patch
readahead-remove-the-size-limit-of-max_sectors_kb-on-read_ahead_kb.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
