2 files changed, 13 insertions, 6 deletions

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index 36ab42c9bb9..6d7e9afd08c 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -99,13 +99,18 @@ struct request {
         /*
          * The rb_node is only used inside the io scheduler, requests
          * are pruned when moved to the dispatch queue. So let the
-         * completion_data share space with the rb_node.
+         * flush fields share space with the rb_node.
          */
         union {
                 struct rb_node rb_node; /* sort/lookup */
-                void *completion_data;
+                struct {
+                        unsigned int                    seq;
+                        struct list_head                list;
+                } flush;
         };
 
+        void *completion_data;
+
         /*
          * Three pointers are available for the IO schedulers, if they need
          * more they have to dynamically allocate it.
@@ -362,11 +367,12 @@ struct request_queue
          * for flush operations
          */
         unsigned int            flush_flags;
-        unsigned int            flush_seq;
-        int                     flush_err;
+        unsigned int            flush_pending_idx:1;
+        unsigned int            flush_running_idx:1;
+        unsigned long           flush_pending_since;
+        struct list_head        flush_queue[2];
+        struct list_head        flush_data_in_flight;
         struct request          flush_rq;
-        struct request          *orig_flush_rq;
-        struct list_head        pending_flushes;
 
         struct mutex            sysfs_lock;
 
diff --git a/include/linux/elevator.h b/include/linux/elevator.h
index 4fd978e7eb8..86120c916fc 100644
--- a/include/linux/elevator.h
+++ b/include/linux/elevator.h
@@ -167,6 +167,7 @@ extern struct request *elv_rb_find(struct rb_root *, sector_t);
 #define ELEVATOR_INSERT_BACK    2
 #define ELEVATOR_INSERT_SORT    3
 #define ELEVATOR_INSERT_REQUEUE 4
+#define ELEVATOR_INSERT_FLUSH   5
 
 /*
  * return values from elevator_may_queue_fn