From e2c730dc529c50a84e8944b8b3266d11244f77ec Mon Sep 17 00:00:00 2001
From: Harvey Harrison <harvey.harrison@gmail.com>
Date: Thu, 29 May 2008 18:27:51 -0700
Subject: [PATCH] --- yaml --- r: 101150 b: refs/heads/master c:
 2d81afb87972013b43b055b4711dc75fdeeb9ba8 h: refs/heads/master v: v3

---
 [refs]              | 2 +-
 trunk/fs/gfs2/log.c | 2 ++
 trunk/fs/gfs2/log.h | 2 ++
 3 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/[refs] b/[refs]
index 248114a5354c..7d7b3f4d9286 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 048bca223739368aa5b9ce7cfb1d576c32d66cc7
+refs/heads/master: 2d81afb87972013b43b055b4711dc75fdeeb9ba8
diff --git a/trunk/fs/gfs2/log.c b/trunk/fs/gfs2/log.c
index 548264b1836d..6c6af9f5e3ab 100644
--- a/trunk/fs/gfs2/log.c
+++ b/trunk/fs/gfs2/log.c
@@ -87,6 +87,8 @@ void gfs2_remove_from_ail(struct gfs2_bufdata *bd)
  */
 
 static void gfs2_ail1_start_one(struct gfs2_sbd *sdp, struct gfs2_ail *ai)
+__releases(&sdp->sd_log_lock)
+__acquires(&sdp->sd_log_lock)
 {
 	struct gfs2_bufdata *bd, *s;
 	struct buffer_head *bh;
diff --git a/trunk/fs/gfs2/log.h b/trunk/fs/gfs2/log.h
index 771152816508..7c64510ccfd2 100644
--- a/trunk/fs/gfs2/log.h
+++ b/trunk/fs/gfs2/log.h
@@ -21,6 +21,7 @@
  */
 
 static inline void gfs2_log_lock(struct gfs2_sbd *sdp)
+__acquires(&sdp->sd_log_lock)
 {
 	spin_lock(&sdp->sd_log_lock);
 }
@@ -32,6 +33,7 @@ static inline void gfs2_log_lock(struct gfs2_sbd *sdp)
  */
 
 static inline void gfs2_log_unlock(struct gfs2_sbd *sdp)
+__releases(&sdp->sd_log_lock)
 {
 	spin_unlock(&sdp->sd_log_lock);
 }