Merge branch 'cfq' into for-linus

2007-04-30 09:09:27 +02:00 · 2007-04-30 09:09:27 +02:00 · 07e4470805
commit 07e4470805
parent 2a12dcd71a 597bc485d6
3 changed files with 455 additions and 432 deletions
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@ -116,6 +116,7 @@ struct io_context {

 	struct as_io_context *aic;
 	struct rb_root cic_root;
+	void *ioc_data;
 };

 void put_io_context(struct io_context *ioc);