diff options
Diffstat (limited to 'include/linux/blkdev.h')
-rw-r--r-- | include/linux/blkdev.h | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h index ce2bf5efa9ba..c75580345700 100644 --- a/include/linux/blkdev.h +++ b/include/linux/blkdev.h | |||
@@ -166,8 +166,9 @@ struct request { | |||
166 | enum rq_cmd_type_bits cmd_type; | 166 | enum rq_cmd_type_bits cmd_type; |
167 | unsigned long atomic_flags; | 167 | unsigned long atomic_flags; |
168 | 168 | ||
169 | sector_t sector; /* sector cursor */ | 169 | /* the following two fields are internal, NEVER access directly */ |
170 | unsigned int data_len; /* total data len, don't access directly */ | 170 | sector_t __sector; /* sector cursor */ |
171 | unsigned int __data_len; /* total data len */ | ||
171 | 172 | ||
172 | struct bio *bio; | 173 | struct bio *bio; |
173 | struct bio *biotail; | 174 | struct bio *biotail; |
@@ -828,12 +829,12 @@ extern void blkdev_dequeue_request(struct request *req); | |||
828 | */ | 829 | */ |
829 | static inline sector_t blk_rq_pos(const struct request *rq) | 830 | static inline sector_t blk_rq_pos(const struct request *rq) |
830 | { | 831 | { |
831 | return rq->sector; | 832 | return rq->__sector; |
832 | } | 833 | } |
833 | 834 | ||
834 | static inline unsigned int blk_rq_bytes(const struct request *rq) | 835 | static inline unsigned int blk_rq_bytes(const struct request *rq) |
835 | { | 836 | { |
836 | return rq->data_len; | 837 | return rq->__data_len; |
837 | } | 838 | } |
838 | 839 | ||
839 | static inline int blk_rq_cur_bytes(const struct request *rq) | 840 | static inline int blk_rq_cur_bytes(const struct request *rq) |