diff options
Diffstat (limited to 'fs/gfs2/locking.c')
-rw-r--r-- | fs/gfs2/locking.c | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/fs/gfs2/locking.c b/fs/gfs2/locking.c index 31421ee6d863..65eca48b2eae 100644 --- a/fs/gfs2/locking.c +++ b/fs/gfs2/locking.c | |||
@@ -21,7 +21,7 @@ | |||
21 | 21 | ||
22 | struct lmh_wrapper { | 22 | struct lmh_wrapper { |
23 | struct list_head lw_list; | 23 | struct list_head lw_list; |
24 | struct lm_lockops *lw_ops; | 24 | const struct lm_lockops *lw_ops; |
25 | }; | 25 | }; |
26 | 26 | ||
27 | /* List of registered low-level locking protocols. A file system selects one | 27 | /* List of registered low-level locking protocols. A file system selects one |
@@ -37,7 +37,7 @@ static DEFINE_MUTEX(lmh_lock); | |||
37 | * Returns: 0 on success, -EXXX on failure | 37 | * Returns: 0 on success, -EXXX on failure |
38 | */ | 38 | */ |
39 | 39 | ||
40 | int gfs2_register_lockproto(struct lm_lockops *proto) | 40 | int gfs2_register_lockproto(const struct lm_lockops *proto) |
41 | { | 41 | { |
42 | struct lmh_wrapper *lw; | 42 | struct lmh_wrapper *lw; |
43 | 43 | ||
@@ -72,7 +72,7 @@ int gfs2_register_lockproto(struct lm_lockops *proto) | |||
72 | * | 72 | * |
73 | */ | 73 | */ |
74 | 74 | ||
75 | void gfs2_unregister_lockproto(struct lm_lockops *proto) | 75 | void gfs2_unregister_lockproto(const struct lm_lockops *proto) |
76 | { | 76 | { |
77 | struct lmh_wrapper *lw; | 77 | struct lmh_wrapper *lw; |
78 | 78 | ||
@@ -108,7 +108,7 @@ void gfs2_unregister_lockproto(struct lm_lockops *proto) | |||
108 | */ | 108 | */ |
109 | 109 | ||
110 | int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data, | 110 | int gfs2_mount_lockproto(char *proto_name, char *table_name, char *host_data, |
111 | lm_callback_t cb, struct gfs2_sbd *sdp, | 111 | lm_callback_t cb, void *cb_data, |
112 | unsigned int min_lvb_size, int flags, | 112 | unsigned int min_lvb_size, int flags, |
113 | struct lm_lockstruct *lockstruct, | 113 | struct lm_lockstruct *lockstruct, |
114 | struct kobject *fskobj) | 114 | struct kobject *fskobj) |
@@ -147,7 +147,7 @@ retry: | |||
147 | goto retry; | 147 | goto retry; |
148 | } | 148 | } |
149 | 149 | ||
150 | error = lw->lw_ops->lm_mount(table_name, host_data, cb, sdp, | 150 | error = lw->lw_ops->lm_mount(table_name, host_data, cb, cb_data, |
151 | min_lvb_size, flags, lockstruct, fskobj); | 151 | min_lvb_size, flags, lockstruct, fskobj); |
152 | if (error) | 152 | if (error) |
153 | module_put(lw->lw_ops->lm_owner); | 153 | module_put(lw->lw_ops->lm_owner); |