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 /block/blk-merge.c | |
| parent | 34b7d2c957199834c474c9d46739265643f4d9c7 (diff) | |
| download | kernel-common-a2dec7b36364a5cc564c4d76cf16d2e7d33f5c05.tar.gz kernel-common-a2dec7b36364a5cc564c4d76cf16d2e7d33f5c05.tar.bz2 kernel-common-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 'block/blk-merge.c')
| -rw-r--r-- | block/blk-merge.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/block/blk-merge.c b/block/blk-merge.c index b8df66aef0f8..4974dd5767e5 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -370,7 +370,7 @@ static int attempt_merge(struct request_queue *q, struct request *req, req->biotail->bi_next = next->bio; req->biotail = next->biotail; - req->data_len += blk_rq_bytes(next); + req->__data_len += blk_rq_bytes(next); elv_merge_requests(q, req, next); |