Re: [PATCH 05/10] block: remove per-queue plugging

[Jens Axboe]

On 2011-03-03 22:23, Mike Snitzer wrote:
>> diff --git a/block/blk-flush.c b/block/blk-flush.c
>> index 54b123d..c0a07aa 100644
>> --- a/block/blk-flush.c
>> +++ b/block/blk-flush.c
>> @@ -59,7 +59,6 @@ static struct request *blk_flush_complete_seq(struct request_queue *q,
>>  static void blk_flush_complete_seq_end_io(struct request_queue *q,
>>                                          unsigned seq, int error)
>>  {
>> -       bool was_empty = elv_queue_empty(q);
>>        struct request *next_rq;
>>
>>        next_rq = blk_flush_complete_seq(q, seq, error);
>> @@ -68,7 +67,7 @@ static void blk_flush_complete_seq_end_io(struct request_queue *q,
>>         * Moving a request silently to empty queue_head may stall the
>>         * queue.  Kick the queue in those cases.
>>         */
>> -       if (was_empty && next_rq)
>> +       if (next_rq)
>>                __blk_run_queue(q);
>>  }
>>
> ...
>> diff --git a/block/elevator.c b/block/elevator.c
>> index a9fe237..d5d17a4 100644
>> --- a/block/elevator.c
>> +++ b/block/elevator.c
>> @@ -619,8 +619,6 @@ void elv_quiesce_end(struct request_queue *q)
> ...
>> -int elv_queue_empty(struct request_queue *q)
>> -{
>> -       struct elevator_queue *e = q->elevator;
>> -
>> -       if (!list_empty(&q->queue_head))
>> -               return 0;
>> -
>> -       if (e->ops->elevator_queue_empty_fn)
>> -               return e->ops->elevator_queue_empty_fn(q);
>> -
>> -       return 1;
>> -}
>> -EXPORT_SYMBOL(elv_queue_empty);
>> -
> 
> Your latest 'for-2.6.39/stack-unplug' rebase (commit 7703acb01e)
> misses removing a call to elv_queue_empty() in
> block/blk-flush.c:flush_data_end_io()
> 
>   CC      block/blk-flush.o
> block/blk-flush.c: In function ‘flush_data_end_io’:
> block/blk-flush.c:266: error: implicit declaration of function ‘elv_queue_empty’

Thanks, also fixed now.

-- 
Jens Axboe

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/