diff options
| author |   Tejun Heo <tj@kernel.org> | 2009-05-07 22:24:44 +0900 |
|---|---|---|
| committer |   Jens Axboe <jens.axboe@oracle.com> | 2009-05-11 09:50:55 +0200 |
| commit | a2dec7b36364a5cc564c4d76cf16d2e7d33f5c05 (patch) | |
| tree | 76dfb84ba5fa097a929ab81cf5718c6fcbc9d720 /include/linux/blkdev.h | |
| parent | ide: cleanup rq->data_len usages (diff) | |
| download | linux-dev-a2dec7b36364a5cc564c4d76cf16d2e7d33f5c05.tar.xz linux-dev-a2dec7b36364a5cc564c4d76cf16d2e7d33f5c05.zip | |
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/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 { enum rq_cmd_type_bits cmd_type; unsigned long atomic_flags; - sector_t sector; /* sector cursor */ - unsigned int data_len; /* total data len, don't access directly */ + /* the following two fields are internal, NEVER access directly */ + sector_t __sector; /* sector cursor */ + unsigned int __data_len; /* total data len */ struct bio *bio; struct bio *biotail; @@ -828,12 +829,12 @@ extern void blkdev_dequeue_request(struct request *req); */ static inline sector_t blk_rq_pos(const struct request *rq) { - return rq->sector; + return rq->__sector; } static inline unsigned int blk_rq_bytes(const struct request *rq) { - return rq->data_len; + return rq->__data_len; } static inline int blk_rq_cur_bytes(const struct request *rq) |