Merge branch 'for-2.6.39/core' of git://git.kernel.dk/linux-2.6-block

[sfrench/cifs-2.6.git] / include / linux / sched.h

diff --git a/include/linux/sched.h b/include/linux/sched.h
index 98fc7ed4b191317db5141b9264a39fc28a2d2c2e..b8369d522bf8e83df7f0e04189d232c4bd59329f 100644 (file)
--- a/include/linux/sched.h
+++ b/include/linux/sched.h
@@ -99,6 +99,7 @@ struct robust_list_head;
 struct bio_list;
 struct fs_struct;
 struct perf_event_context;
+struct blk_plug;
 
 /*
  * List of flags we want to share for kernel threads,
@@ -1428,6 +1429,11 @@ struct task_struct {
 /* stacked block device info */
        struct bio_list *bio_list;
 
+#ifdef CONFIG_BLOCK
+/* stack plugging */
+       struct blk_plug *plug;
+#endif
+
 /* VM state */
        struct reclaim_state *reclaim_state;