diff options
Diffstat (limited to 'fs/gfs2/locking/dlm/mount.c')
-rw-r--r-- | fs/gfs2/locking/dlm/mount.c | 8 |
1 files changed, 4 insertions, 4 deletions
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; | |||
14 | struct lm_lockops gdlm_ops; | 14 | struct lm_lockops gdlm_ops; |
15 | 15 | ||
16 | 16 | ||
17 | static struct gdlm_ls *init_gdlm(lm_callback_t cb, lm_fsdata_t *fsdata, | 17 | static struct gdlm_ls *init_gdlm(lm_callback_t cb, struct gfs2_sbd *sdp, |
18 | int flags, char *table_name) | 18 | int flags, char *table_name) |
19 | { | 19 | { |
20 | struct gdlm_ls *ls; | 20 | struct gdlm_ls *ls; |
@@ -27,7 +27,7 @@ static struct gdlm_ls *init_gdlm(lm_callback_t cb, lm_fsdata_t *fsdata, | |||
27 | ls->drop_locks_count = gdlm_drop_count; | 27 | ls->drop_locks_count = gdlm_drop_count; |
28 | ls->drop_locks_period = gdlm_drop_period; | 28 | ls->drop_locks_period = gdlm_drop_period; |
29 | ls->fscb = cb; | 29 | ls->fscb = cb; |
30 | ls->fsdata = fsdata; | 30 | ls->sdp = sdp; |
31 | ls->fsflags = flags; | 31 | ls->fsflags = flags; |
32 | spin_lock_init(&ls->async_lock); | 32 | spin_lock_init(&ls->async_lock); |
33 | INIT_LIST_HEAD(&ls->complete); | 33 | INIT_LIST_HEAD(&ls->complete); |
@@ -120,7 +120,7 @@ static int make_args(struct gdlm_ls *ls, char *data_arg, int *nodir) | |||
120 | } | 120 | } |
121 | 121 | ||
122 | static int gdlm_mount(char *table_name, char *host_data, | 122 | static int gdlm_mount(char *table_name, char *host_data, |
123 | lm_callback_t cb, lm_fsdata_t *fsdata, | 123 | lm_callback_t cb, struct gfs2_sbd *sdp, |
124 | unsigned int min_lvb_size, int flags, | 124 | unsigned int min_lvb_size, int flags, |
125 | struct lm_lockstruct *lockstruct, | 125 | struct lm_lockstruct *lockstruct, |
126 | struct kobject *fskobj) | 126 | struct kobject *fskobj) |
@@ -131,7 +131,7 @@ static int gdlm_mount(char *table_name, char *host_data, | |||
131 | if (min_lvb_size > GDLM_LVB_SIZE) | 131 | if (min_lvb_size > GDLM_LVB_SIZE) |
132 | goto out; | 132 | goto out; |
133 | 133 | ||
134 | ls = init_gdlm(cb, fsdata, flags, table_name); | 134 | ls = init_gdlm(cb, sdp, flags, table_name); |
135 | if (!ls) | 135 | if (!ls) |
136 | goto out; | 136 | goto out; |
137 | 137 | ||