1 files changed, 7 insertions, 6 deletions

diff --git a/block/ll_rw_blk.c b/block/ll_rw_blk.c
index a15845c164f2..cd20367061d7 100644
--- a/block/ll_rw_blk.c
+++ b/block/ll_rw_blk.c
@@ -1075,12 +1075,6 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
                  */
                 return;
 
-        if (unlikely(!__test_and_clear_bit(tag, bqt->tag_map))) {
-                printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
-                       __FUNCTION__, tag);
-                return;
-        }
-
         list_del_init(&rq->queuelist);
         rq->cmd_flags &= ~REQ_QUEUED;
         rq->tag = -1;
@@ -1090,6 +1084,13 @@ void blk_queue_end_tag(struct request_queue *q, struct request *rq)
                        __FUNCTION__, tag);
 
         bqt->tag_index[tag] = NULL;
+
+        if (unlikely(!test_and_clear_bit(tag, bqt->tag_map))) {
+                printk(KERN_ERR "%s: attempt to clear non-busy tag (%d)\n",
+                       __FUNCTION__, tag);
+                return;
+        }
+
         bqt->busy--;
 }