Overrun end of disk in cache redahead

If you're willing to restrict the flexibility of your approach,
you can almost always do something better.
-- John Carmack

Remove readahead from block2mtd.

Signed-off-by: Jörn Engel <[email protected]>
---

 drivers/mtd/devices/block2mtd.c |   55 ++--------------------------------------
 1 file changed, 4 insertions(+), 51 deletions(-)

--- slab/drivers/mtd/devices/block2mtd.c~block2mtd	2006-08-11 13:03:22.000000000 +0200
+++ slab/drivers/mtd/devices/block2mtd.c	2006-09-11 00:00:26.000000000 +0200
@@ -39,56 +39,9 @@ struct block2mtd_dev {
 static LIST_HEAD(blkmtd_device_list);
 
 
-#define PAGE_READAHEAD 64
-static void cache_readahead(struct address_space *mapping, int index)
-{
-	filler_t *filler = (filler_t*)mapping->a_ops->readpage;
-	int i, pagei;
-	unsigned ret = 0;
-	unsigned long end_index;
-	struct page *page;
-	LIST_HEAD(page_pool);
-	struct inode *inode = mapping->host;
-	loff_t isize = i_size_read(inode);
-
-	if (!isize) {
-		INFO("iSize=0 in cache_readahead\n");
-		return;
-	}
-
-	end_index = ((isize - 1) >> PAGE_CACHE_SHIFT);
-
-	read_lock_irq(&mapping->tree_lock);
-	for (i = 0; i < PAGE_READAHEAD; i++) {
-		pagei = index + i;
-		if (pagei > end_index) {
-			INFO("Overrun end of disk in cache readahead\n");
-			break;
-		}
-		page = radix_tree_lookup(&mapping->page_tree, pagei);
-		if (page && (!i))
-			break;
-		if (page)
-			continue;
-		read_unlock_irq(&mapping->tree_lock);
-		page = page_cache_alloc_cold(mapping);
-		read_lock_irq(&mapping->tree_lock);
-		if (!page)
-			break;
-		page->index = pagei;
-		list_add(&page->lru, &page_pool);
-		ret++;
-	}
-	read_unlock_irq(&mapping->tree_lock);
-	if (ret)
-		read_cache_pages(mapping, &page_pool, filler, NULL);
-}
-
-
-static struct page* page_readahead(struct address_space *mapping, int index)
+static struct page *readpage(struct address_space *mapping, int index)
 {
 	filler_t *filler = (filler_t*)mapping->a_ops->readpage;
-	cache_readahead(mapping, index);
 	return read_cache_page(mapping, index, filler, NULL);
 }
 
@@ -104,7 +57,7 @@ static int _block2mtd_erase(struct block
 	u_long *max;
 
 	while (pages) {
-		page = page_readahead(mapping, index);
+		page = readpage(mapping, index);
 		if (!page)
 			return -ENOMEM;
 		if (IS_ERR(page))
@@ -174,7 +127,7 @@ static int block2mtd_read(struct mtd_inf
 		len = len - cpylen;
 
 		//      Get page
-		page = page_readahead(dev->blkdev->bd_inode->i_mapping, index);
+		page = readpage(dev->blkdev->bd_inode->i_mapping, index);
 		if (!page)
 			return -ENOMEM;
 		if (IS_ERR(page))
@@ -213,7 +166,7 @@ static int _block2mtd_write(struct block
 		len = len - cpylen;
 
 		//	Get page
-		page = page_readahead(mapping, index);
+		page = readpage(mapping, index);
 		if (!page)
 			return -ENOMEM;
 		if (IS_ERR(page))