Re: [PATCH] gfs2: trivial sparse lock annotations

[Steven Whitehouse <swhiteho@redhat.com>]

Hi,

Now in the GFS2 -nmw git tree. Thanks,

Steve.

On Thu, 2008-05-29 at 18:27 -0700, Harvey Harrison wrote:
> Annotate the &sdp->sd_log_lock.
> 
> Signed-off-by: Harvey Harrison <harvey.harrison@gmail.com>
> ---
>  fs/gfs2/log.c |    2 ++
>  fs/gfs2/log.h |    2 ++
>  2 files changed, 4 insertions(+), 0 deletions(-)
> 
> diff --git a/fs/gfs2/log.c b/fs/gfs2/log.c
> index 548264b..6c6af9f 100644
> --- a/fs/gfs2/log.c
> +++ b/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/fs/gfs2/log.h b/fs/gfs2/log.h
> index 7711528..7c64510 100644
> --- a/fs/gfs2/log.h
> +++ b/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);
>  }