X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=include%2Flinux%2Fblkdev.h;h=db5b00a792f519d7d4dde9a2e4824a2c7f948db9;hb=2ecf042ef530dd0943e41d84b6344f507941af3e;hp=36a6eacefe20d2c17f60b9b34c569cc8f425a843;hpb=975a8e3ed2b9eab9f062a1e0ba7fe180e15204e1;p=powerpc.git

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 36a6eacefe..db5b00a792 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -82,7 +82,6 @@ struct cfq_io_context {
 
 	unsigned long last_end_request;
 	sector_t last_request_pos;
- 	unsigned long last_queue;
 
 	unsigned long ttime_total;
 	unsigned long ttime_samples;
@@ -117,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);
@@ -854,7 +854,7 @@ static inline void put_dev_sector(Sector p)
 
 struct work_struct;
 int kblockd_schedule_work(struct work_struct *work);
-void kblockd_flush(void);
+void kblockd_flush_work(struct work_struct *work);
 
 #define MODULE_ALIAS_BLOCKDEV(major,minor) \
 	MODULE_ALIAS("block-major-" __stringify(major) "-" __stringify(minor))