History

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 ]

Tejun Heo committed 17 years ago

Commit a2dec7b1 parent 34b7d2c4 files · +17 −16Browse files

Unified · Split

4 files
  1. block/blk-core.c +10 −10
  2. block/blk-map.c +1 −1
  3. block/blk-merge.c +1 −1
  4. include/linux/blkdev.h +5 −4
block/blk-core.c+10−10
@@ -127,7 +127,7 @@ void blk_rq_init(struct request_queue *q, struct request *rq) · 126 unmodified lines
127127 INIT_LIST_HEAD(&rq->timeout_list);
128128 rq->cpu = -1;
129129 rq->q = q;
130− rq->sector = (sector_t) -1;
130+ rq->__sector = (sector_t) -1;
131131 INIT_HLIST_NODE(&rq->hash);
132132 RB_CLEAR_NODE(&rq->rb_node);
133133 rq->cmd = rq->__cmd;
@@ -1095,7 +1095,7 @@ void init_request_from_bio(struct request *req, struct bio *bio) · 961 unmodified lines
10951095 req->cmd_flags |= REQ_NOIDLE;
10961096
10971097 req->errors = 0;
1098− req->sector = bio->bi_sector;
1098+ req->__sector = bio->bi_sector;
10991099 req->ioprio = bio_prio(bio);
11001100 blk_rq_bio_prep(req->q, req, bio);
11011101 }
@@ -1143,7 +1143,7 @@ static int __make_request(struct request_queue *q, struct bio *bio) · 41 unmodified lines
11431143
11441144 req->biotail->bi_next = bio;
11451145 req->biotail = bio;
1146− req->data_len += bytes;
1146+ req->__data_len += bytes;
11471147 req->ioprio = ioprio_best(req->ioprio, prio);
11481148 if (!blk_rq_cpu_valid(req))
11491149 req->cpu = bio->bi_comp_cpu;
@@ -1169,8 +1169,8 @@ static int __make_request(struct request_queue *q, struct bio *bio) · 19 unmodified lines
11691169 * not touch req->buffer either...
11701170 */
11711171 req->buffer = bio_data(bio);
1172− req->sector = bio->bi_sector;
1173− req->data_len += bytes;
1172+ req->__sector = bio->bi_sector;
1173+ req->__data_len += bytes;
11741174 req->ioprio = ioprio_best(req->ioprio, prio);
11751175 if (!blk_rq_cpu_valid(req))
11761176 req->cpu = bio->bi_comp_cpu;
@@ -1878,7 +1878,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) · 701 unmodified lines
18781878 * can find how many bytes remain in the request
18791879 * later.
18801880 */
1881− req->data_len = 0;
1881+ req->__data_len = 0;
18821882 return false;
18831883 }
18841884
@@ -1892,12 +1892,12 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) · 7 unmodified lines
18921892 bio_iovec(bio)->bv_len -= nr_bytes;
18931893 }
18941894
1895− req->data_len -= total_bytes;
1895+ req->__data_len -= total_bytes;
18961896 req->buffer = bio_data(req->bio);
18971897
18981898 /* update sector only for requests with clear definition of sector */
18991899 if (blk_fs_request(req) || blk_discard_rq(req))
1900− req->sector += total_bytes >> 9;
1900+ req->__sector += total_bytes >> 9;
19011901
19021902 /*
19031903 * If total number of sectors is less than the first segment
@@ -1905,7 +1905,7 @@ bool blk_update_request(struct request *req, int error, unsigned int nr_bytes) · 1 unmodified line
19051905 */
19061906 if (blk_rq_bytes(req) < blk_rq_cur_bytes(req)) {
19071907 printk(KERN_ERR "blk: request botched\n");
1908− req->data_len = blk_rq_cur_bytes(req);
1908+ req->__data_len = blk_rq_cur_bytes(req);
19091909 }
19101910
19111911 /* recalculate the number of segments */
@@ -2032,7 +2032,7 @@ void blk_rq_bio_prep(struct request_queue *q, struct request *rq, · 120 unmodified lines
20322032 rq->nr_phys_segments = bio_phys_segments(q, bio);
20332033 rq->buffer = bio_data(bio);
20342034 }
2035− rq->data_len = bio->bi_size;
2035+ rq->__data_len = bio->bi_size;
20362036 rq->bio = rq->biotail = bio;
20372037
20382038 if (bio->bi_bdev)
block/blk-map.c+1−1
@@ -20,7 +20,7 @@ int blk_rq_append_bio(struct request_queue *q, struct request *rq, · 19 unmodified lines
2020 rq->biotail->bi_next = bio;
2121 rq->biotail = bio;
2222
23− rq->data_len += bio->bi_size;
23+ rq->__data_len += bio->bi_size;
2424 }
2525 return 0;
2626 }
block/blk-merge.c+1−1
@@ -370,7 +370,7 @@ static int attempt_merge(struct request_queue *q, struct request *req, · 369 unmodified lines
370370 req->biotail->bi_next = next->bio;
371371 req->biotail = next->biotail;
372372
373− req->data_len += blk_rq_bytes(next);
373+ req->__data_len += blk_rq_bytes(next);
374374
375375 elv_merge_requests(q, req, next);
376376
include/linux/blkdev.h+5−4
@@ -166,8 +166,9 @@ struct request { · 165 unmodified lines
166166 enum rq_cmd_type_bits cmd_type;
167167 unsigned long atomic_flags;
168168
169− sector_t sector; /* sector cursor */
170− unsigned int data_len; /* total data len, don't access directly */
169+ /* the following two fields are internal, NEVER access directly */
170+ sector_t __sector; /* sector cursor */
171+ unsigned int __data_len; /* total data len */
171172
172173 struct bio *bio;
173174 struct bio *biotail;
@@ -828,12 +829,12 @@ extern void blkdev_dequeue_request(struct request *req); · 654 unmodified lines
828829 */
829830 static inline sector_t blk_rq_pos(const struct request *rq)
830831 {
831− return rq->sector;
832+ return rq->__sector;
832833 }
833834
834835 static inline unsigned int blk_rq_bytes(const struct request *rq)
835836 {
836− return rq->data_len;
837+ return rq->__data_len;
837838 }
838839
839840 static inline int blk_rq_cur_bytes(const struct request *rq)

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t