aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorTejun Heo <tj@kernel.org>2009-05-07 09:24:44 -0400
committerJens Axboe <jens.axboe@oracle.com>2009-05-11 03:50:55 -0400
commita2dec7b36364a5cc564c4d76cf16d2e7d33f5c05 (patch)
tree76dfb84ba5fa097a929ab81cf5718c6fcbc9d720 /include
parent34b7d2c957199834c474c9d46739265643f4d9c7 (diff)
block: hide request sector and data_len
Block low level drivers for some reason have been pretty good at abusing block layer API. Especially struct request's fields tend to get violated in all possible ways. Make it clear that low level drivers MUST NOT access or manipulate rq->sector and rq->data_len directly by prefixing them with double underscores. This change is also necessary to break build of out-of-tree codes which assume the previous block API where internal fields can be manipulated and rq->data_len carries residual count on completion. [ Impact: hide internal fields, block API change ] Signed-off-by: Tejun Heo <tj@kernel.org> Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'include')
-rw-r--r--include/linux/blkdev.h9
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 */
829static inline sector_t blk_rq_pos(const struct request *rq) 830static inline sector_t blk_rq_pos(const struct request *rq)
830{ 831{
831 return rq->sector; 832 return rq->__sector;
832} 833}
833 834
834static inline unsigned int blk_rq_bytes(const struct request *rq) 835static 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
839static inline int blk_rq_cur_bytes(const struct request *rq) 840static inline int blk_rq_cur_bytes(const struct request *rq)