4 files changed, 9 insertions, 9 deletions

diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
index c7b6e370258f..e6898d236521 100644
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/fs/gfs2/locking/dlm/lock_dlm.h
@@ -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;
diff --git a/fs/gfs2/locking/dlm/mount.c b/fs/gfs2/locking/dlm/mount.c
index 82ac00af84a3..8a1764f4d71c 100644
--- a/fs/gfs2/locking/dlm/mount.c
+++ b/fs/gfs2/locking/dlm/mount.c
@@ -14,7 +14,7 @@ int gdlm_drop_period;
 struct lm_lockops gdlm_ops;
 
 
-static struct gdlm_ls *init_gdlm(lm_callback_t cb, lm_fsdata_t *fsdata,
+static struct gdlm_ls *init_gdlm(lm_callback_t cb, struct gfs2_sbd *sdp,
                                  int flags, char *table_name)
 {
         struct gdlm_ls *ls;
@@ -27,7 +27,7 @@ static struct gdlm_ls *init_gdlm(lm_callback_t cb, lm_fsdata_t *fsdata,
         ls->drop_locks_count = gdlm_drop_count;
         ls->drop_locks_period = gdlm_drop_period;
         ls->fscb = cb;
-        ls->fsdata = fsdata;
+        ls->sdp = sdp;
         ls->fsflags = flags;
         spin_lock_init(&ls->async_lock);
         INIT_LIST_HEAD(&ls->complete);
@@ -120,7 +120,7 @@ static int make_args(struct gdlm_ls *ls, char *data_arg, int *nodir)
 }
 
 static int gdlm_mount(char *table_name, char *host_data,
-                        lm_callback_t cb, lm_fsdata_t *fsdata,
+                        lm_callback_t cb, struct gfs2_sbd *sdp,
                         unsigned int min_lvb_size, int flags,
                         struct lm_lockstruct *lockstruct,
                         struct kobject *fskobj)
@@ -131,7 +131,7 @@ static int gdlm_mount(char *table_name, char *host_data,
         if (min_lvb_size > GDLM_LVB_SIZE)
                 goto out;
 
-        ls = init_gdlm(cb, fsdata, flags, table_name);
+        ls = init_gdlm(cb, sdp, flags, table_name);
         if (!ls)
                 goto out;
 
diff --git a/fs/gfs2/locking/dlm/sysfs.c b/fs/gfs2/locking/dlm/sysfs.c
index c1237a91fc68..29ae06f94944 100644
--- a/fs/gfs2/locking/dlm/sysfs.c
+++ b/fs/gfs2/locking/dlm/sysfs.c
@@ -102,7 +102,7 @@ static ssize_t recover_show(struct gdlm_ls *ls, char *buf)
 static ssize_t recover_store(struct gdlm_ls *ls, const char *buf, size_t len)
 {
         ls->recover_jid = simple_strtol(buf, NULL, 0);
-        ls->fscb(ls->fsdata, LM_CB_NEED_RECOVERY, &ls->recover_jid);
+        ls->fscb(ls->sdp, LM_CB_NEED_RECOVERY, &ls->recover_jid);
         return len;
 }
 
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index d4895ec242f6..554bf882a4c2 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -41,7 +41,7 @@ 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)
@@ -232,7 +232,7 @@ out:
             (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)
@@ -318,7 +318,7 @@ static int gdlm_thread(void *data)
                         gdlm_do_lock(lp);
 
                 if (drop)
-                        ls->fscb(ls->fsdata, LM_CB_DROPLOCKS, NULL);
+                        ls->fscb(ls->sdp, LM_CB_DROPLOCKS, NULL);
 
                 schedule();
         }