aboutsummaryrefslogtreecommitdiffstats
path: root/block
diff options
context:
space:
mode:
authorTejun Heo2009-04-22 21:05:20 -0500
committerJens Axboe2009-04-28 00:37:36 -0500
commit731ec497e5888c6792ad62613ae9be97eebcd7ca (patch)
tree689a8442d8bdfd50ee6ab05b0c6acd0d229fe391 /block
parentec24751a6b57e1373a12361e581b2458bc9bb791 (diff)
downloadkernel-common-731ec497e5888c6792ad62613ae9be97eebcd7ca.tar.gz
kernel-common-731ec497e5888c6792ad62613ae9be97eebcd7ca.tar.xz
kernel-common-731ec497e5888c6792ad62613ae9be97eebcd7ca.zip
block: kill rq->data
Now that all block request data transfer is done via bio, rq->data isn't used. Kill it. While at it, make the roles of rq->special and buffer clear. [ Impact: drop now unncessary field from struct request ] Signed-off-by: Tejun Heo <tj@kernel.org> Cc: Boaz Harrosh <bharrosh@panasas.com>
Diffstat (limited to 'block')
-rw-r--r--block/blk-core.c5
-rw-r--r--block/blk-map.c6
-rw-r--r--block/scsi_ioctl.c1
3 files changed, 5 insertions, 7 deletions
diff --git a/block/blk-core.c b/block/blk-core.c
index 0520cc70458..6dd180cf15d 100644
--- a/block/blk-core.c
+++ b/block/blk-core.c
@@ -189,10 +189,9 @@ void blk_dump_rq_flags(struct request *rq, char *msg)
189 (unsigned long long)rq->sector, 189 (unsigned long long)rq->sector,
190 rq->nr_sectors, 190 rq->nr_sectors,
191 rq->current_nr_sectors); 191 rq->current_nr_sectors);
192 printk(KERN_INFO " bio %p, biotail %p, buffer %p, data %p, len %u\n", 192 printk(KERN_INFO " bio %p, biotail %p, buffer %p, len %u\n",
193 rq->bio, rq->biotail, 193 rq->bio, rq->biotail,
194 rq->buffer, rq->data, 194 rq->buffer, rq->data_len);
195 rq->data_len);
196 195
197 if (blk_pc_request(rq)) { 196 if (blk_pc_request(rq)) {
198 printk(KERN_INFO " cdb: "); 197 printk(KERN_INFO " cdb: ");
diff --git a/block/blk-map.c b/block/blk-map.c
index f103729b462..694fefad34e 100644
--- a/block/blk-map.c
+++ b/block/blk-map.c
@@ -156,7 +156,7 @@ int blk_rq_map_user(struct request_queue *q, struct request *rq,
156 if (!bio_flagged(bio, BIO_USER_MAPPED)) 156 if (!bio_flagged(bio, BIO_USER_MAPPED))
157 rq->cmd_flags |= REQ_COPY_USER; 157 rq->cmd_flags |= REQ_COPY_USER;
158 158
159 rq->buffer = rq->data = NULL; 159 rq->buffer = NULL;
160 return 0; 160 return 0;
161unmap_rq: 161unmap_rq:
162 blk_rq_unmap_user(bio); 162 blk_rq_unmap_user(bio);
@@ -235,7 +235,7 @@ int blk_rq_map_user_iov(struct request_queue *q, struct request *rq,
235 blk_queue_bounce(q, &bio); 235 blk_queue_bounce(q, &bio);
236 bio_get(bio); 236 bio_get(bio);
237 blk_rq_bio_prep(q, rq, bio); 237 blk_rq_bio_prep(q, rq, bio);
238 rq->buffer = rq->data = NULL; 238 rq->buffer = NULL;
239 return 0; 239 return 0;
240} 240}
241EXPORT_SYMBOL(blk_rq_map_user_iov); 241EXPORT_SYMBOL(blk_rq_map_user_iov);
@@ -313,7 +313,7 @@ int blk_rq_map_kern(struct request_queue *q, struct request *rq, void *kbuf,
313 313
314 blk_rq_bio_prep(q, rq, bio); 314 blk_rq_bio_prep(q, rq, bio);
315 blk_queue_bounce(q, &rq->bio); 315 blk_queue_bounce(q, &rq->bio);
316 rq->buffer = rq->data = NULL; 316 rq->buffer = NULL;
317 return 0; 317 return 0;
318} 318}
319EXPORT_SYMBOL(blk_rq_map_kern); 319EXPORT_SYMBOL(blk_rq_map_kern);
diff --git a/block/scsi_ioctl.c b/block/scsi_ioctl.c
index 82a0ca2f672..bb9aa43551b 100644
--- a/block/scsi_ioctl.c
+++ b/block/scsi_ioctl.c
@@ -500,7 +500,6 @@ static int __blk_send_generic(struct request_queue *q, struct gendisk *bd_disk,
500 500
501 rq = blk_get_request(q, WRITE, __GFP_WAIT); 501 rq = blk_get_request(q, WRITE, __GFP_WAIT);
502 rq->cmd_type = REQ_TYPE_BLOCK_PC; 502 rq->cmd_type = REQ_TYPE_BLOCK_PC;
503 rq->data = NULL;
504 rq->data_len = 0; 503 rq->data_len = 0;
505 rq->extra_len = 0; 504 rq->extra_len = 0;
506 rq->timeout = BLK_DEFAULT_SG_TIMEOUT; 505 rq->timeout = BLK_DEFAULT_SG_TIMEOUT;