From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755364AbbCCAzu (ORCPT ); Mon, 2 Mar 2015 19:55:50 -0500 Received: from mail-qg0-f54.google.com ([209.85.192.54]:35464 "EHLO mail-qg0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755118AbbCCAzs (ORCPT ); Mon, 2 Mar 2015 19:55:48 -0500 Date: Mon, 2 Mar 2015 19:55:45 -0500 From: Jeff Layton To: Daniel Wagner Cc: Jeff Layton , linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: Re: [RFC v2 2/4] locks: Add lockdep assertion for blocked_lock_lock Message-ID: <20150302195545.49ec1cb9@tlielax.poochiereds.net> In-Reply-To: <1425306313-7234-3-git-send-email-daniel.wagner@bmw-carit.de> References: <1425306313-7234-1-git-send-email-daniel.wagner@bmw-carit.de> <1425306313-7234-3-git-send-email-daniel.wagner@bmw-carit.de> X-Mailer: Claws Mail 3.11.1 (GTK+ 2.24.26; x86_64-redhat-linux-gnu) MIME-Version: 1.0 Content-Type: text/plain; charset=US-ASCII Content-Transfer-Encoding: 7bit Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org On Mon, 2 Mar 2015 15:25:11 +0100 Daniel Wagner wrote: > Annonate insert, remove and iterate function that we need > blocked_lock_lock held. > > Signed-off-by: Daniel Wagner > --- > fs/locks.c | 6 ++++++ > 1 file changed, 6 insertions(+) > > diff --git a/fs/locks.c b/fs/locks.c > index f63aa92..4498da0 100644 > --- a/fs/locks.c > +++ b/fs/locks.c > @@ -592,11 +592,15 @@ posix_owner_key(struct file_lock *fl) > > static void locks_insert_global_blocked(struct file_lock *waiter) > { > + lockdep_assert_held(&blocked_lock_lock); > + > hash_add(blocked_hash, &waiter->fl_link, posix_owner_key(waiter)); > } > > static void locks_delete_global_blocked(struct file_lock *waiter) > { > + lockdep_assert_held(&blocked_lock_lock); > + > hash_del(&waiter->fl_link); > } > > @@ -838,6 +842,8 @@ static int posix_locks_deadlock(struct file_lock *caller_fl, > { > int i = 0; > > + lockdep_assert_held(&blocked_lock_lock); > + > /* > * This deadlock detector can't reasonably detect deadlocks with > * FL_OFDLCK locks, since they aren't owned by a process, per-se. Merged for v4.1. -- Jeff Layton