pandora: defconfig: update

[pandora-kernel.git] / block / blk-flush.c

diff --git a/block/blk-flush.c b/block/blk-flush.c
index 491eb30..720ad60 100644 (file)
--- a/block/blk-flush.c
+++ b/block/blk-flush.c
@@ -320,7 +320,7 @@ void blk_insert_flush(struct request *rq)
                return;
        }
 
-       BUG_ON(!rq->bio || rq->bio != rq->biotail);
+       BUG_ON(rq->bio != rq->biotail); /*assumes zero or single bio rq */
 
        /*
         * If there's data but flush is not necessary, the request can be
@@ -330,7 +330,6 @@ void blk_insert_flush(struct request *rq)
        if ((policy & REQ_FSEQ_DATA) &&
            !(policy & (REQ_FSEQ_PREFLUSH | REQ_FSEQ_POSTFLUSH))) {
                list_add_tail(&rq->queuelist, &q->queue_head);
-               blk_run_queue_async(q);
                return;
        }