[GFS2] Tidy up locking code

[linux.git] / fs / gfs2 / lm.c

diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c
index 06a785e9b5822965e2ec8d6e32a0cbcfa76377fa..fb918c7de655d05cffdd022cef8c490ed758b65a 100644 (file)
--- a/fs/gfs2/lm.c
+++ b/fs/gfs2/lm.c
@@ -1,10 +1,10 @@
 /*
  * Copyright (C) Sistina Software, Inc.  1997-2003 All rights reserved.
- * Copyright (C) 2004-2005 Red Hat, Inc.  All rights reserved.
+ * Copyright (C) 2004-2006 Red Hat, Inc.  All rights reserved.
  *
  * This copyrighted material is made available to anyone wishing to use,
  * modify, copy, or redistribute it subject to the terms and conditions
- * of the GNU General Public License v.2.
+ * of the GNU General Public License version 2.
  */
 
 #include <linux/sched.h>
@@ -14,7 +14,6 @@
 #include <linux/buffer_head.h>
 #include <linux/delay.h>
 #include <linux/gfs2_ondisk.h>
-#include <asm/semaphore.h>
 
 #include "gfs2.h"
 #include "lm_interface.h"
@@ -23,7 +22,6 @@
 #include "lm.h"
 #include "super.h"
 #include "util.h"
-#include "lvb.h"
 
 /**
  * gfs2_lm_mount - mount a locking protocol
@@ -126,10 +124,8 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
 int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,
                     lm_lock_t **lockp)
 {
-       int error;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               error = -EIO;
-       else
+       int error = -EIO;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                error = sdp->sd_lockstruct.ls_ops->lm_get_lock(
                                sdp->sd_lockstruct.ls_lockspace, name, lockp);
        return error;
@@ -145,12 +141,9 @@ unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock,
                          unsigned int cur_state, unsigned int req_state,
                          unsigned int flags)
 {
-       int ret;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               ret = 0;
-       else
-               ret = sdp->sd_lockstruct.ls_ops->lm_lock(lock,
-                                                        cur_state,
+       int ret = 0;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
+               ret = sdp->sd_lockstruct.ls_ops->lm_lock(lock, cur_state,
                                                         req_state, flags);
        return ret;
 }
@@ -158,10 +151,8 @@ unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock,
 unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock,
                            unsigned int cur_state)
 {
-       int ret;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               ret = 0;
-       else
+       int ret = 0;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                ret =  sdp->sd_lockstruct.ls_ops->lm_unlock(lock, cur_state);
        return ret;
 }
@@ -174,10 +165,8 @@ void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock)
 
 int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp)
 {
-       int error;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               error = -EIO;
-       else
+       int error = -EIO;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                error = sdp->sd_lockstruct.ls_ops->lm_hold_lvb(lock, lvbp);
        return error;
 }
@@ -188,50 +177,33 @@ void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb)
                sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(lock, lvb);
 }
 
-#if 0
-void gfs2_lm_sync_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb)
-{
-       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               sdp->sd_lockstruct.ls_ops->lm_sync_lvb(lock, lvb);
-}
-#endif  /*  0  */
-
 int gfs2_lm_plock_get(struct gfs2_sbd *sdp, struct lm_lockname *name,
                      struct file *file, struct file_lock *fl)
 {
-       int error;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               error = -EIO;
-       else
+       int error = -EIO;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                error = sdp->sd_lockstruct.ls_ops->lm_plock_get(
-                       sdp->sd_lockstruct.ls_lockspace,
-                       name, file, fl);
+                               sdp->sd_lockstruct.ls_lockspace, name, file, fl);
        return error;
 }
 
 int gfs2_lm_plock(struct gfs2_sbd *sdp, struct lm_lockname *name,
                  struct file *file, int cmd, struct file_lock *fl)
 {
-       int error;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               error = -EIO;
-       else
+       int error = -EIO;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                error = sdp->sd_lockstruct.ls_ops->lm_plock(
-                       sdp->sd_lockstruct.ls_lockspace,
-                       name, file, cmd, fl);
+                               sdp->sd_lockstruct.ls_lockspace, name, file, cmd, fl);
        return error;
 }
 
 int gfs2_lm_punlock(struct gfs2_sbd *sdp, struct lm_lockname *name,
                    struct file *file, struct file_lock *fl)
 {
-       int error;
-       if (unlikely(test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
-               error = -EIO;
-       else
+       int error = -EIO;
+       if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
                error = sdp->sd_lockstruct.ls_ops->lm_punlock(
-                       sdp->sd_lockstruct.ls_lockspace,
-                       name, file, fl);
+                               sdp->sd_lockstruct.ls_lockspace, name, file, fl);
        return error;
 }