aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJens Axboe <jens.axboe@oracle.com>2007-04-24 15:17:33 -0400
committerJens Axboe <axboe@nelson.home.kernel.dk>2007-04-30 03:01:23 -0400
commit4e521c27eee33cebd618c26649e2c93803004647 (patch)
tree0ad4b1e5df66da0848074cda47a79f7d7dae75f5
parent91fac317a34859986a2359a5a5c0e37dc17a9c3d (diff)
ll_rw_blk: add io_context private pointer
To be used by as/cfq as they see fit. Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
-rw-r--r--block/ll_rw_blk.c1
-rw-r--r--include/linux/blkdev.h1
2 files changed, 2 insertions, 0 deletions
diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index 3de06953ac33..123003a90477 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -3741,6 +3741,7 @@ static struct io_context *current_io_context(gfp_t gfp_flags, int node)
3741 ret->nr_batch_requests = 0; /* because this is 0 */ 3741 ret->nr_batch_requests = 0; /* because this is 0 */
3742 ret->aic = NULL; 3742 ret->aic = NULL;
3743 ret->cic_root.rb_node = NULL; 3743 ret->cic_root.rb_node = NULL;
3744 ret->ioc_data = NULL;
3744 /* make sure set_task_ioprio() sees the settings above */ 3745 /* make sure set_task_ioprio() sees the settings above */
3745 smp_wmb(); 3746 smp_wmb();
3746 tsk->io_context = ret; 3747 tsk->io_context = ret;
diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 83dcd8c0e974..a686eabe22d6 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -116,6 +116,7 @@ struct io_context {
116 116
117 struct as_io_context *aic; 117 struct as_io_context *aic;
118 struct rb_root cic_root; 118 struct rb_root cic_root;
119 void *ioc_data;
119}; 120};
120 121
121void put_io_context(struct io_context *ioc); 122void put_io_context(struct io_context *ioc);