[GFS2] Use void * instead of typedef for locking module interface

[linux-2.6-block.git] / fs / gfs2 / locking / dlm / lock_dlm.h

diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
index 530c2f542584da507dbe24e76414cda9cf913094..3a45c020d01e3176335097646898445ee0a6d7dc 100644 (file)
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/fs/gfs2/locking/dlm/lock_dlm.h
@@ -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.
  */
 
 #ifndef LOCK_DLM_DOT_H
@@ -56,7 +56,7 @@ enum {
 };
 
 struct gdlm_ls {
-       uint32_t                id;
+       u32             id;
        int                     jid;
        int                     first;
        int                     first_done;
@@ -67,7 +67,7 @@ struct gdlm_ls {
        int                     fsflags;
        dlm_lockspace_t         *dlm_lockspace;
        lm_callback_t           fscb;
-       lm_fsdata_t             *fsdata;
+       struct gfs2_sbd         *sdp;
        int                     recover_jid;
        int                     recover_jid_done;
        int                     recover_jid_status;
@@ -77,7 +77,7 @@ struct gdlm_ls {
        struct list_head        delayed;
        struct list_head        submit;
        struct list_head        all_locks;
-       uint32_t                all_locks_count;
+       u32             all_locks_count;
        wait_queue_head_t       wait_control;
        struct task_struct      *thread1;
        struct task_struct      *thread2;
@@ -109,10 +109,10 @@ struct gdlm_lock {
        char                    *lvb;
        struct dlm_lksb         lksb;
 
-       int16_t                 cur;
-       int16_t                 req;
-       int16_t                 prev_req;
-       uint32_t                lkf;            /* dlm flags DLM_LKF_ */
+       s16                     cur;
+       s16                     req;
+       s16                     prev_req;
+       u32                     lkf;            /* dlm flags DLM_LKF_ */
        unsigned long           flags;          /* lock_dlm flags LFL_ */
 
        int                     bast_mode;      /* protected by async_lock */
@@ -158,31 +158,30 @@ void gdlm_release_threads(struct gdlm_ls *);
 
 /* lock.c */
 
-int16_t gdlm_make_lmstate(int16_t);
+s16 gdlm_make_lmstate(s16);
 void gdlm_queue_delayed(struct gdlm_lock *);
 void gdlm_submit_delayed(struct gdlm_ls *);
 int gdlm_release_all_locks(struct gdlm_ls *);
 void gdlm_delete_lp(struct gdlm_lock *);
 unsigned int gdlm_do_lock(struct gdlm_lock *);
 
-int gdlm_get_lock(lm_lockspace_t *, struct lm_lockname *, lm_lock_t **);
-void gdlm_put_lock(lm_lock_t *);
-unsigned int gdlm_lock(lm_lock_t *, unsigned int, unsigned int, unsigned int);
-unsigned int gdlm_unlock(lm_lock_t *, unsigned int);
-void gdlm_cancel(lm_lock_t *);
-int gdlm_hold_lvb(lm_lock_t *, char **);
-void gdlm_unhold_lvb(lm_lock_t *, char *);
-void gdlm_sync_lvb(lm_lock_t *, char *);
+int gdlm_get_lock(void *, struct lm_lockname *, void **);
+void gdlm_put_lock(void *);
+unsigned int gdlm_lock(void *, unsigned int, unsigned int, unsigned int);
+unsigned int gdlm_unlock(void *, unsigned int);
+void gdlm_cancel(void *);
+int gdlm_hold_lvb(void *, char **);
+void gdlm_unhold_lvb(void *, char *);
 
 /* plock.c */
 
 int gdlm_plock_init(void);
 void gdlm_plock_exit(void);
-int gdlm_plock(lm_lockspace_t *, struct lm_lockname *, struct file *, int,
+int gdlm_plock(void *, struct lm_lockname *, struct file *, int,
                struct file_lock *);
-int gdlm_plock_get(lm_lockspace_t *, struct lm_lockname *, struct file *,
+int gdlm_plock_get(void *, struct lm_lockname *, struct file *,
                struct file_lock *);
-int gdlm_punlock(lm_lockspace_t *, struct lm_lockname *, struct file *,
+int gdlm_punlock(void *, struct lm_lockname *, struct file *,
                struct file_lock *);
 #endif