[GFS2] Remove one typedef

[linux-2.6] / fs / gfs2 / locking / dlm / thread.c

diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index 6fe669cd334b53af2acdb1cb0e61a687c3639ef5..554bf882a4c2bf48287f6ceb6dc55c2a19db821b 100644 (file)
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -4,7 +4,7 @@
  *
  * 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 "lock_dlm.h"
@@ -41,20 +41,21 @@ static void process_blocking(struct gdlm_lock *lp, int bast_mode)
                gdlm_assert(0, "unknown bast mode %u", lp->bast_mode);
        }
 
-       ls->fscb(ls->fsdata, cb, &lp->lockname);
+       ls->fscb(ls->sdp, cb, &lp->lockname);
 }
 
 static void process_complete(struct gdlm_lock *lp)
 {
        struct gdlm_ls *ls = lp->ls;
        struct lm_async_cb acb;
-       int16_t prev_mode = lp->cur;
+       s16 prev_mode = lp->cur;
 
        memset(&acb, 0, sizeof(acb));
 
        if (lp->lksb.sb_status == -DLM_ECANCEL) {
                log_info("complete dlm cancel %x,%llx flags %lx",
-                        lp->lockname.ln_type, lp->lockname.ln_number,
+                        lp->lockname.ln_type, 
+                        (unsigned long long)lp->lockname.ln_number,
                         lp->flags);
 
                lp->req = lp->cur;
@@ -68,7 +69,8 @@ static void process_complete(struct gdlm_lock *lp)
                if (lp->lksb.sb_status != -DLM_EUNLOCK) {
                        log_info("unlock sb_status %d %x,%llx flags %lx",
                                 lp->lksb.sb_status, lp->lockname.ln_type,
-                                lp->lockname.ln_number, lp->flags);
+                                (unsigned long long)lp->lockname.ln_number,
+                                lp->flags);
                        return;
                }
 
@@ -100,7 +102,8 @@ static void process_complete(struct gdlm_lock *lp)
 
        if (test_and_clear_bit(LFL_CANCEL, &lp->flags)) {
                log_info("complete internal cancel %x,%llx",
-                        lp->lockname.ln_type, lp->lockname.ln_number);
+                        lp->lockname.ln_type, 
+                        (unsigned long long)lp->lockname.ln_number);
                lp->req = lp->cur;
                acb.lc_ret |= LM_OUT_CANCELED;
                goto out;
@@ -123,7 +126,8 @@ static void process_complete(struct gdlm_lock *lp)
                /* this could only happen with cancels I think */
                log_info("ast sb_status %d %x,%llx flags %lx",
                         lp->lksb.sb_status, lp->lockname.ln_type,
-                        lp->lockname.ln_number, lp->flags);
+                        (unsigned long long)lp->lockname.ln_number,
+                        lp->flags);
                return;
        }
 
@@ -144,9 +148,11 @@ static void process_complete(struct gdlm_lock *lp)
 
        if (test_and_clear_bit(LFL_REREQUEST, &lp->flags)) {
                gdlm_assert(lp->req == DLM_LOCK_NL, "%x,%llx",
-                           lp->lockname.ln_type, lp->lockname.ln_number);
+                           lp->lockname.ln_type,
+                           (unsigned long long)lp->lockname.ln_number);
                gdlm_assert(lp->prev_req > DLM_LOCK_NL, "%x,%llx",
-                           lp->lockname.ln_type, lp->lockname.ln_number);
+                           lp->lockname.ln_type,
+                           (unsigned long long)lp->lockname.ln_number);
 
                lp->cur = DLM_LOCK_NL;
                lp->req = lp->prev_req;
@@ -183,7 +189,8 @@ static void process_complete(struct gdlm_lock *lp)
                lp->lkf &= ~DLM_LKF_CONVDEADLK;
 
                log_debug("rereq %x,%llx id %x %d,%d",
-                         lp->lockname.ln_type, lp->lockname.ln_number,
+                         lp->lockname.ln_type,
+                         (unsigned long long)lp->lockname.ln_number,
                          lp->lksb.sb_lkid, lp->cur, lp->req);
 
                set_bit(LFL_REREQUEST, &lp->flags);
@@ -199,7 +206,7 @@ static void process_complete(struct gdlm_lock *lp)
        if (lp->lksb.sb_flags & DLM_SBF_DEMOTED)
                set_bit(LFL_NOCACHE, &lp->flags);
 
- out:
+out:
        /*
         * This is an internal lock_dlm lock
         */
@@ -225,7 +232,7 @@ static void process_complete(struct gdlm_lock *lp)
            (lp->cur > DLM_LOCK_NL) && (prev_mode > DLM_LOCK_NL))
                acb.lc_ret |= LM_OUT_CACHEABLE;
 
-       ls->fscb(ls->fsdata, LM_CB_ASYNC, &acb);
+       ls->fscb(ls->sdp, LM_CB_ASYNC, &acb);
 }
 
 static inline int no_work(struct gdlm_ls *ls, int blocking)
@@ -308,10 +315,10 @@ static int gdlm_thread(void *data)
                        process_blocking(lp, blocking);
 
                else if (submit)
-                       gdlm_do_lock(lp, NULL);
+                       gdlm_do_lock(lp);
 
                if (drop)
-                       ls->fscb(ls->fsdata, LM_CB_DROPLOCKS, NULL);
+                       ls->fscb(ls->sdp, LM_CB_DROPLOCKS, NULL);
 
                schedule();
        }