From 55abaad6183fd444b3633fab5fbf15d57cff68c8 Mon Sep 17 00:00:00 2001
From: Tejun Heo <tj@kernel.org>
Date: Tue, 28 Apr 2009 13:06:13 +0900
Subject: [PATCH] --- yaml --- r: 146996 b: refs/heads/master c:
 e138b4e08ef65771000fbe6d93d67e3960ff862b h: refs/heads/master v: v3

---
 [refs]                     | 2 +-
 trunk/drivers/block/swim.c | 7 -------
 2 files changed, 1 insertion(+), 8 deletions(-)

diff --git a/[refs] b/[refs]
index 2d0636c82ee9..a501e16dc8d6 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 467ca759fc83fc35cb7d15aec0d74c62cffc4481
+refs/heads/master: e138b4e08ef65771000fbe6d93d67e3960ff862b
diff --git a/trunk/drivers/block/swim.c b/trunk/drivers/block/swim.c
index 6544a7b06bf0..97ef4266c4c7 100644
--- a/trunk/drivers/block/swim.c
+++ b/trunk/drivers/block/swim.c
@@ -535,10 +535,6 @@ static void redo_fd_request(struct request_queue *q)
 			__blk_end_request_cur(req, -EIO);
 			continue;
 		}
-		if (req->current_nr_sectors == 0) {
-			__blk_end_request_cur(req, 0);
-			continue;
-		}
 		if (!fs->disk_in) {
 			__blk_end_request_cur(req, -EIO);
 			continue;
@@ -561,9 +557,6 @@ static void redo_fd_request(struct request_queue *q)
 				__blk_end_request_cur(req, -EIO);
 				continue;
 			}
-			req->nr_sectors -= req->current_nr_sectors;
-			req->sector += req->current_nr_sectors;
-			req->buffer += req->current_nr_sectors * 512;
 			__blk_end_request_cur(req, 0);
 			break;
 		}