block: drop request->hard_* and *nr_sectors

[pandora-kernel.git] / include / linux / elevator.h

diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index c59b769..4e46287 100644 (file)
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -171,7 +171,7 @@ enum {
        ELV_MQUEUE_MUST,
 };
 
-#define rq_end_sector(rq)      ((rq)->sector + (rq)->nr_sectors)
+#define rq_end_sector(rq)      (blk_rq_pos(rq) + blk_rq_sectors(rq))
 #define rb_entry_rq(node)      rb_entry((node), struct request, rb_node)
 
 /*