Merge branch 'fixes' of git://ftp.arm.linux.org.uk/~rmk/linux-arm

[linux-2.6-block.git] / block / blk-mq-tag.c

diff --git a/block/blk-mq-tag.c b/block/blk-mq-tag.c
index a07ca3488d96fb7a96159fbe48c0c9e5e95391ec..abdbb47405cb840c7005618cdece6b3165850ecc 100644 (file)
--- a/block/blk-mq-tag.c
+++ b/block/blk-mq-tag.c
@@ -268,7 +268,7 @@ static int bt_get(struct blk_mq_alloc_data *data,
        if (tag != -1)
                return tag;
 
-       if (!gfpflags_allow_blocking(data->gfp))
+       if (data->flags & BLK_MQ_REQ_NOWAIT)
                return -1;
 
        bs = bt_wait_ptr(bt, hctx);
@@ -303,7 +303,7 @@ static int bt_get(struct blk_mq_alloc_data *data,
                data->ctx = blk_mq_get_ctx(data->q);
                data->hctx = data->q->mq_ops->map_queue(data->q,
                                data->ctx->cpu);
-               if (data->reserved) {
+               if (data->flags & BLK_MQ_REQ_RESERVED) {
                        bt = &data->hctx->tags->breserved_tags;
                } else {
                        last_tag = &data->ctx->last_tag;
@@ -349,10 +349,9 @@ static unsigned int __blk_mq_get_reserved_tag(struct blk_mq_alloc_data *data)
 
 unsigned int blk_mq_get_tag(struct blk_mq_alloc_data *data)
 {
-       if (!data->reserved)
-               return __blk_mq_get_tag(data);
-
-       return __blk_mq_get_reserved_tag(data);
+       if (data->flags & BLK_MQ_REQ_RESERVED)
+               return __blk_mq_get_reserved_tag(data);
+       return __blk_mq_get_tag(data);
 }
 
 static struct bt_wait_state *bt_wake_ptr(struct blk_mq_bitmap_tags *bt)