Re: linux-next: Tree for Oct 25 (block ?)

[Jens Axboe <axboe@kernel.dk>]

On 2011-10-25 16:03, Sedat Dilek wrote:
> On Tue, Oct 25, 2011 at 3:55 PM, Jens Axboe <axboe@kernel.dk> wrote:
>> On 2011-10-25 15:43, Sedat Dilek wrote:
>>> On Tue, Oct 25, 2011 at 3:38 PM, Jens Axboe <axboe@kernel.dk> wrote:
>>>> On 2011-10-25 15:10, Sedat Dilek wrote:
>>>>> On Tue, Oct 25, 2011 at 3:04 PM, Sedat Dilek <sedat.dilek@googlemail.com> wrote:
>>>>>> On Tue, Oct 25, 2011 at 11:36 AM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
>>>>>>> Hi all,
>>>>>>>
>>>>>>> *Note well*
>>>>>>>
>>>>>>> This tree has nate had any build testing at all.  As such, it probably
>>>>>>> doesn't build :-) This tree is really just a roll up of the current state
>>>>>>> of the trees when the v3.2 merge window opened.  It will not be put into
>>>>>>> the build system referred to below.
>>>>>>>
>>>>>>
>>>>>> I have generated a single linux-next (next-20111025) patch on top of
>>>>>> v3.1, it's approx. 100M!
>>>>>>
>>>>>> $ du -h patch-v3.1-next-20111025.patch
>>>>>> 96M     patch-v3.1-next-20111025.patch
>>>>>>
>>>>>> I noticed this build-failure:
>>>>>>
>>>>>>  CC      block/blk-throttle.o
>>>>>>  CC [M]  fs/fuse/dir.o
>>>>>> /mnt/sdb3/linux-kernel/linux-3.1/debian/build/source_i386_none/block/blk-throttle.c:
>>>>>> In function 'blk_throtl_drain':
>>>>>> /mnt/sdb3/linux-kernel/linux-3.1/debian/build/source_i386_none/block/blk-throttle.c:1221:2:
>>>>>> error: implicit declaration of function 'lockdep_is_held'
>>>>>> [-Werror=implicit-function-declaration]
>>>>>> cc1: some warnings being treated as errors
>>>>>>
>>>>>> make[5]: *** [block/blk-throttle.o] Error 1
>>>>>> make[4]: *** [block] Error 2
>>>>>>
>>>>>> This happens with Debian's gcc-4.6 (4.6.1-16) and default
>>>>>> KBUILD_ENABLE_EXTRA_GCC_CHECKS value.
>>>>>>
>>>>>> - Sedat -
>>>>>>
>>>>>
>>>>> Looks like "#include <linux/lockdep.h>" is missing in block/blk-throttle.c?
>>>>
>>>> Hmm, I wonder why it isn't triggering for cfq-iosched.o or elevator.o as
>>>> well. Is blk-throttle modular? What is your .config?
>>>>
>>>> --
>>>> Jens Axboe
>>>>
>>>>
>>>
>>> CONFIG_BLK_DEV_THROTTLING=y
>>>
>>> My kernel-config is attached.
>>
>> The below should work, I checked it in.
>>
>>
>> commit 334c2b0b8b2ab186fa198413386cba41fffcb4f2
>> Author: Jens Axboe <axboe@kernel.dk>
>> Date:   Tue Oct 25 15:51:48 2011 +0200
>>
>>    blk-throttle: use queue_is_locked() instead of lockdep_is_held()
>>
>>    We can't use the latter if !CONFIG_LOCKDEP.
>>
>>    Reported-by: Sedat Dilek <sedat.dilek@googlemail.com>
>>    Signed-off-by: Jens Axboe <axboe@kernel.dk>
>>
>> diff --git a/block/blk-throttle.c b/block/blk-throttle.c
>> index 8edb949..4553245 100644
>> --- a/block/blk-throttle.c
>> +++ b/block/blk-throttle.c
>> @@ -1218,7 +1218,7 @@ void blk_throtl_drain(struct request_queue *q)
>>        struct bio_list bl;
>>        struct bio *bio;
>>
>> -       lockdep_is_held(q->queue_lock);
>> +       WARN_ON_ONCE(!queue_is_locked(q));
>>
>>        bio_list_init(&bl);
>>
>>
>> --
>> Jens Axboe
>>
>>
> 
> Hi Jens,
> 
> Thanks for the explanations and the quick fix!
> 
> Continued with 'make':
> ...
>   CC      block/blk-throttle.o
>   CC      block/noop-iosched.o
>   CC      block/deadline-iosched.o
>   CC      block/cfq-iosched.o
>   CC      block/blk-integrity.o
>   LD      block/built-in.o
> ...
> 
> Feel free to add:
> 
>     Tested-by: Sedat Dilek <sedat.dilek@gmail.com>

I wish I could, but it's already in...

-- 
Jens Axboe