From: Josh Triplett <josht@us.ibm.com>
Date: Wed, 27 Sep 2006 08:49:26 +0000 (-0700)
Subject: [PATCH] jbd: add lock annotation to jbd_sync_bh
X-Git-Tag: v2.6.19-rc1~1001
X-Git-Url: http://pilppa.com/gitweb/?a=commitdiff_plain;h=e7ab8d65055e9b9dfc131d0467cfc5a8368d7ee4;p=linux-2.6-omap-h63xx.git

[PATCH] jbd: add lock annotation to jbd_sync_bh

jbd_sync_bh releases journal->j_list_lock.  Add a lock annotation to this
function so that sparse can check callers for lock pairing, and so that
sparse will not complain about this function since it intentionally uses
the lock in this manner.

Signed-off-by: Josh Triplett <josh@freedesktop.org>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
---

diff --git a/fs/jbd/checkpoint.c b/fs/jbd/checkpoint.c
index 47678a26c13..d0685596e5a 100644
--- a/fs/jbd/checkpoint.c
+++ b/fs/jbd/checkpoint.c
@@ -145,6 +145,7 @@ void __log_wait_for_space(journal_t *journal)
  * jbd_unlock_bh_state().
  */
 static void jbd_sync_bh(journal_t *journal, struct buffer_head *bh)
+	__releases(journal->j_list_lock)
 {
 	get_bh(bh);
 	spin_unlock(&journal->j_list_lock);