From e58ecf596e953fa8b887fb90c49982bde9cb2aed Mon Sep 17 00:00:00 2001
From: Jens Axboe <jens.axboe@oracle.com>
Date: Tue, 19 Dec 2006 08:27:31 +0100
Subject: [PATCH] --- yaml --- r: 44840 b: refs/heads/master c:
 2985259b0e3928d4cd0723ac5aad0d1190ab7717 h: refs/heads/master v: v3

---
 [refs]                        | 2 +-
 trunk/block/ll_rw_blk.c       | 6 ++----
 trunk/drivers/scsi/scsi_lib.c | 2 --
 3 files changed, 3 insertions(+), 7 deletions(-)

diff --git a/[refs] b/[refs]
index 38c5f77dacb7..893039181cc3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a52de245ef0b6217a56fb2472ff65c3a196cafd5
+refs/heads/master: 2985259b0e3928d4cd0723ac5aad0d1190ab7717
diff --git a/trunk/block/ll_rw_blk.c b/trunk/block/ll_rw_blk.c
index 79807dbc306e..71a78a7e42fd 100644
--- a/trunk/block/ll_rw_blk.c
+++ b/trunk/block/ll_rw_blk.c
@@ -2350,12 +2350,12 @@ static int __blk_rq_map_user(request_queue_t *q, struct request *rq,
 	else
 		bio = bio_copy_user(q, uaddr, len, reading);
 
-	if (IS_ERR(bio)) {
+	if (IS_ERR(bio))
 		return PTR_ERR(bio);
-	}
 
 	orig_bio = bio;
 	blk_queue_bounce(q, &bio);
+
 	/*
 	 * We link the bounce buffer in and could have to traverse it
 	 * later so we have to get a ref to prevent it from being freed
@@ -2379,8 +2379,6 @@ static int __blk_rq_map_user(request_queue_t *q, struct request *rq,
 		rq->biotail->bi_next = bio;
 		rq->biotail = bio;
 
-		rq->nr_sectors += bio_sectors(bio);
-		rq->hard_nr_sectors = rq->nr_sectors;
 		rq->data_len += bio->bi_size;
 	}
 	spin_unlock_irq(q->queue_lock);
diff --git a/trunk/drivers/scsi/scsi_lib.c b/trunk/drivers/scsi/scsi_lib.c
index 1748e27501cd..41a2ea32a300 100644
--- a/trunk/drivers/scsi/scsi_lib.c
+++ b/trunk/drivers/scsi/scsi_lib.c
@@ -270,8 +270,6 @@ static int scsi_merge_bio(struct request *rq, struct bio *bio)
 	else {
 		rq->biotail->bi_next = bio;
 		rq->biotail = bio;
-		rq->hard_nr_sectors += bio_sectors(bio);
-		rq->nr_sectors = rq->hard_nr_sectors;
 	}
 
 	return 0;