Merge branch 'linus' into core/softlockup

[mirror_ubuntu-hirsute-kernel.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 58fcf8c5bf39ec15439c8fe2a2ad003ffe90d275..3c98e7c6f93bb50b3a71b3cb6d11dd91aa9d1d56 100644 (file)
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/fs/gfs2/locking/dlm/lock_dlm.h
@@ -25,6 +25,7 @@
 #include <net/sock.h>
 
 #include <linux/dlm.h>
+#include <linux/dlm_plock.h>
 #include <linux/lm_interface.h>
 
 /*
@@ -71,19 +72,12 @@ struct gdlm_ls {
        int                     recover_jid_done;
        int                     recover_jid_status;
        spinlock_t              async_lock;
-       struct list_head        complete;
-       struct list_head        blocking;
        struct list_head        delayed;
        struct list_head        submit;
-       struct list_head        all_locks;
        u32             all_locks_count;
        wait_queue_head_t       wait_control;
-       struct task_struct      *thread1;
-       struct task_struct      *thread2;
+       struct task_struct      *thread;
        wait_queue_head_t       thread_wait;
-       unsigned long           drop_time;
-       int                     drop_locks_count;
-       int                     drop_locks_period;
 };
 
 enum {
@@ -116,12 +110,7 @@ struct gdlm_lock {
        u32                     lkf;            /* dlm flags DLM_LKF_ */
        unsigned long           flags;          /* lock_dlm flags LFL_ */
 
-       int                     bast_mode;      /* protected by async_lock */
-
-       struct list_head        clist;          /* complete */
-       struct list_head        blist;          /* blocking */
        struct list_head        delay_list;     /* delayed */
-       struct list_head        all_list;       /* all locks for the fs */
        struct gdlm_lock        *hold_null;     /* NL lock for hold_lvb */
 };
 
@@ -158,11 +147,7 @@ void gdlm_release_threads(struct gdlm_ls *);
 
 /* lock.c */
 
-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(void *, struct lm_lockname *, void **);
@@ -173,17 +158,6 @@ 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(void *, struct lm_lockname *, struct file *, int,
-               struct file_lock *);
-int gdlm_plock_get(void *, struct lm_lockname *, struct file *,
-               struct file_lock *);
-int gdlm_punlock(void *, struct lm_lockname *, struct file *,
-               struct file_lock *);
-
 /* mount.c */
 
 extern const struct lm_lockops gdlm_ops;