From 868bb835eefd582f7a7aa79340a4d155cd701ed0 Mon Sep 17 00:00:00 2001
From: Fengguang Wu <wfg@mail.ustc.edu.cn>
Date: Tue, 16 Oct 2007 01:24:36 -0700
Subject: [PATCH] --- yaml --- r: 69599 b: refs/heads/master c:
 f2e189827a914b66e435e68b1c9e37775cb995ed h: refs/heads/master i:   69597:
 54c0b6dd9e144d8861d993cefffeec4c02ac276e   69595:
 a37656bb918f338270cc36e3ccd4ff65edeae145   69591:
 2484dc5b62aca1879bb8f00c3598559f60133edc   69583:
 cad3eb787b1010e97a92fdd22e9648a881ae72ae   69567:
 71f1e08ac62603f0c50de9ec0d5385c939acc1be v: v3

---
 [refs]                  | 2 +-
 trunk/block/ll_rw_blk.c | 9 ---------
 2 files changed, 1 insertion(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index 09bc696e22d8..5850115304a2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 535443f51543df61111bbd234300ae549d220448
+refs/heads/master: f2e189827a914b66e435e68b1c9e37775cb995ed
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index d875673e76cd..a83823fcd74f 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -3928,7 +3928,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
 			max_hw_sectors_kb = q->max_hw_sectors >> 1,
 			page_kb = 1 << (PAGE_CACHE_SHIFT - 10);
 	ssize_t ret = queue_var_store(&max_sectors_kb, page, count);
-	int ra_kb;
 
 	if (max_sectors_kb > max_hw_sectors_kb || max_sectors_kb < page_kb)
 		return -EINVAL;
@@ -3937,14 +3936,6 @@ queue_max_sectors_store(struct request_queue *q, const char *page, size_t count)
 	 * values synchronously:
 	 */
 	spin_lock_irq(q->queue_lock);
-	/*
-	 * Trim readahead window as well, if necessary:
-	 */
-	ra_kb = q->backing_dev_info.ra_pages << (PAGE_CACHE_SHIFT - 10);
-	if (ra_kb > max_sectors_kb)
-		q->backing_dev_info.ra_pages =
-				max_sectors_kb >> (PAGE_CACHE_SHIFT - 10);
-
 	q->max_sectors = max_sectors_kb << 1;
 	spin_unlock_irq(q->queue_lock);