diff options
-rw-r--r-- | block/blk-barrier.c | 2 | ||||
-rw-r--r-- | include/linux/bio.h | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/block/blk-barrier.c b/block/blk-barrier.c index 7c6f4a714687..a3482425c507 100644 --- a/block/blk-barrier.c +++ b/block/blk-barrier.c | |||
@@ -143,7 +143,7 @@ static void queue_flush(struct request_queue *q, unsigned which) | |||
143 | } | 143 | } |
144 | 144 | ||
145 | blk_rq_init(q, rq); | 145 | blk_rq_init(q, rq); |
146 | rq->cmd_flags = REQ_HARDBARRIER; | 146 | rq->cmd_flags = REQ_HARDBARRIER | REQ_FLUSH; |
147 | rq->rq_disk = q->bar_rq.rq_disk; | 147 | rq->rq_disk = q->bar_rq.rq_disk; |
148 | rq->end_io = end_io; | 148 | rq->end_io = end_io; |
149 | q->prepare_flush_fn(q, rq); | 149 | q->prepare_flush_fn(q, rq); |
diff --git a/include/linux/bio.h b/include/linux/bio.h index 4d379c8250ae..f655b54c9ef3 100644 --- a/include/linux/bio.h +++ b/include/linux/bio.h | |||
@@ -174,6 +174,7 @@ enum rq_flag_bits { | |||
174 | __REQ_ALLOCED, /* request came from our alloc pool */ | 174 | __REQ_ALLOCED, /* request came from our alloc pool */ |
175 | __REQ_COPY_USER, /* contains copies of user pages */ | 175 | __REQ_COPY_USER, /* contains copies of user pages */ |
176 | __REQ_INTEGRITY, /* integrity metadata has been remapped */ | 176 | __REQ_INTEGRITY, /* integrity metadata has been remapped */ |
177 | __REQ_FLUSH, /* request for cache flush */ | ||
177 | __REQ_IO_STAT, /* account I/O stat */ | 178 | __REQ_IO_STAT, /* account I/O stat */ |
178 | __REQ_MIXED_MERGE, /* merge of different types, fail separately */ | 179 | __REQ_MIXED_MERGE, /* merge of different types, fail separately */ |
179 | __REQ_NR_BITS, /* stops here */ | 180 | __REQ_NR_BITS, /* stops here */ |
@@ -213,6 +214,7 @@ enum rq_flag_bits { | |||
213 | #define REQ_ALLOCED (1 << __REQ_ALLOCED) | 214 | #define REQ_ALLOCED (1 << __REQ_ALLOCED) |
214 | #define REQ_COPY_USER (1 << __REQ_COPY_USER) | 215 | #define REQ_COPY_USER (1 << __REQ_COPY_USER) |
215 | #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) | 216 | #define REQ_INTEGRITY (1 << __REQ_INTEGRITY) |
217 | #define REQ_FLUSH (1 << __REQ_FLUSH) | ||
216 | #define REQ_IO_STAT (1 << __REQ_IO_STAT) | 218 | #define REQ_IO_STAT (1 << __REQ_IO_STAT) |
217 | #define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE) | 219 | #define REQ_MIXED_MERGE (1 << __REQ_MIXED_MERGE) |
218 | 220 | ||