aboutsummaryrefslogtreecommitdiffstats
path: root/block/elevator.c
diff options
context:
space:
mode:
authorMikulas Patocka <mpatocka@redhat.com>2008-08-15 04:20:02 -0400
committerJens Axboe <jens.axboe@oracle.com>2008-10-09 02:56:03 -0400
commit5df97b91b5d7ed426034fcc84cb6e7cf682b8838 (patch)
tree727b9fb778f72d2b1ff44c007fb5209bacf67f4a /block/elevator.c
parentb8b3e16cfe6435d961f6aaebcfd52a1ff2a988c5 (diff)
drop vmerge accounting
Remove hw_segments field from struct bio and struct request. Without virtual merge accounting they have no purpose. Signed-off-by: Mikulas Patocka <mpatocka@redhat.com> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'block/elevator.c')
-rw-r--r--block/elevator.c2
1 files changed, 0 insertions, 2 deletions
diff --git a/block/elevator.c b/block/elevator.c
index 4f5127054e3f..269615e6dbf5 100644
--- a/block/elevator.c
+++ b/block/elevator.c
@@ -790,7 +790,6 @@ struct request *elv_next_request(struct request_queue *q)
790 * device can handle 790 * device can handle
791 */ 791 */
792 rq->nr_phys_segments++; 792 rq->nr_phys_segments++;
793 rq->nr_hw_segments++;
794 } 793 }
795 794
796 if (!q->prep_rq_fn) 795 if (!q->prep_rq_fn)
@@ -813,7 +812,6 @@ struct request *elv_next_request(struct request_queue *q)
813 * so that we don't add it again 812 * so that we don't add it again
814 */ 813 */
815 --rq->nr_phys_segments; 814 --rq->nr_phys_segments;
816 --rq->nr_hw_segments;
817 } 815 }
818 816
819 rq = NULL; 817 rq = NULL;