From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <linux-kernel-owner@vger.kernel.org>
Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand
	id S1753887Ab1J0RFa (ORCPT <rfc822;w@1wt.eu>);
	Thu, 27 Oct 2011 13:05:30 -0400
Received: from mx1.redhat.com ([209.132.183.28]:7369 "EHLO mx1.redhat.com"
	rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP
	id S1751759Ab1J0RF3 (ORCPT <rfc822;linux-kernel@vger.kernel.org>);
	Thu, 27 Oct 2011 13:05:29 -0400
Date: Thu, 27 Oct 2011 13:05:24 -0400
From: Vivek Goyal <vgoyal@redhat.com>
To: Tejun Heo <tj@kernel.org>
Cc: axboe@kernel.dk, ctalbott@google.com, rni@google.com,
        linux-kernel@vger.kernel.org
Subject: Re: [PATCH UPDATED 10/13] block, cfq: unlink cfq_io_context's
 immediately
Message-ID: <20111027170524.GH7491@redhat.com>
References: <1319593719-19132-1-git-send-email-tj@kernel.org>
 <1319593719-19132-11-git-send-email-tj@kernel.org>
 <20111026213107.GI24261@google.com>
 <20111027143119.GD7491@redhat.com>
 <20111027161701.GB29899@google.com>
MIME-Version: 1.0
Content-Type: text/plain; charset=us-ascii
Content-Disposition: inline
In-Reply-To: <20111027161701.GB29899@google.com>
User-Agent: Mutt/1.5.21 (2010-09-15)
Sender: linux-kernel-owner@vger.kernel.org
List-ID: <linux-kernel.vger.kernel.org>
X-Mailing-List: linux-kernel@vger.kernel.org

On Thu, Oct 27, 2011 at 09:17:01AM -0700, Tejun Heo wrote:
> Hello,
> 
> On Thu, Oct 27, 2011 at 10:31:19AM -0400, Vivek Goyal wrote:
> > On Wed, Oct 26, 2011 at 02:31:07PM -0700, Tejun Heo wrote:
> > >  	BUG_ON(atomic_long_read(&ioc->refcount) <= 0);
> > > +	if (locked_q)
> > > +		lockdep_assert_held(locked_q->queue_lock);
> > >  
> > 
> > Looks like lockdep_assert_held() can't be used if !CONFIG_LOCKDEP. So
> > Jens had put following patch to fix one compilation issue. You might
> > want to provide a null definition of lockdep_assert_held() in case
> > of !CONFIG_LOCKDEP.
> > 
> > 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>
> 
> Eh?  lockdep.h has dummy definition if !CONFIG_LOCKDEP.

I can't seem to find the dummy definition in include/linux/lockdep.h for
!CONFIG_LOCKDEP.

I see only following under CONFIG_LOCKDEP.

#define lockdep_is_held(lock)   lock_is_held(&(lock)->dep_map)

and nothing under #else clause.

Thanks
Vivek