Merge tag 'pull-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs

[sfrench/cifs-2.6.git] / block / blk-flush.c

diff --git a/block/blk-flush.c b/block/blk-flush.c
index c689687248706ab40f32fc229b7985fb5b21a1a5..d20a0c6b2c66edb451a120f26d2348c6061956c6 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -94,7 +94,7 @@ enum {
 };
 
 static void blk_kick_flush(struct request_queue *q,
-                          struct blk_flush_queue *fq, unsigned int flags);
+                          struct blk_flush_queue *fq, blk_opf_t flags);
 
 static inline struct blk_flush_queue *
 blk_get_flush_queue(struct request_queue *q, struct blk_mq_ctx *ctx)
@@ -173,7 +173,7 @@ static void blk_flush_complete_seq(struct request *rq,
 {
        struct request_queue *q = rq->q;
        struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];
-       unsigned int cmd_flags;
+       blk_opf_t cmd_flags;
 
        BUG_ON(rq->flush.seq & seq);
        rq->flush.seq |= seq;
@@ -290,7 +290,7 @@ bool is_flush_rq(struct request *rq)
  *
  */
 static void blk_kick_flush(struct request_queue *q, struct blk_flush_queue *fq,
-                          unsigned int flags)
+                          blk_opf_t flags)
 {
        struct list_head *pending = &fq->flush_queue[fq->flush_pending_idx];
        struct request *first_rq =