[PATCH 4/7] xfs: lockdep annotations for xfs_dqlock2

[Dave Chinner]

On Mon, Jan 12, 2009 at 10:15:44AM -0500, Christoph Hellwig wrote:
> On Mon, Jan 12, 2009 at 10:06:37AM +1100, Dave Chinner wrote:
> > This looks a bit wierd.
> > 
> > Yes, xfs_dqlock() is just a wrapper around mutex_lock, but we should
> > be consistent here. Can you add a xfs_dqlock_nested() wrapper to do
> > this?
> 
> I don't think we should add more of the silly wrappers.  What about
> the version below that always uses plain mutex_lock* in xfs_dqlock2?

Fair enough.

> ---
> 
> Subject: xfs: lockdep annotations for xfs_dqlock2
> From: Christoph Hellwig <hch at lst.de>
> 
> xfs_dqlock2 locks two xfs_dquots, which is fine as it always locks the
> dquot with the lower id first.  Use mutex_lock_nested to tell lockdep 
> about this fact.  Also clean up xfs_dqlock2 a bit by rationalizing
> the conditionals and always using the mutex_lock family of functions
> directly.
> 
> 
> Signed-off-by: Christoph Hellwig <hch at lst.de>

Reviewed-by: Dave Chinner <david at fromorbit.com>

-- 
Dave Chinner
david at fromorbit.com