aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lm.c
diff options
context:
space:
mode:
Diffstat (limited to 'fs/gfs2/lm.c')
-rw-r--r--fs/gfs2/lm.c14
1 files changed, 7 insertions, 7 deletions
diff --git a/fs/gfs2/lm.c b/fs/gfs2/lm.c
index e60f95cae6c5..4e23aa5ef75d 100644
--- a/fs/gfs2/lm.c
+++ b/fs/gfs2/lm.c
@@ -122,7 +122,7 @@ int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
122} 122}
123 123
124int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name, 124int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,
125 lm_lock_t **lockp) 125 void **lockp)
126{ 126{
127 int error = -EIO; 127 int error = -EIO;
128 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 128 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
@@ -131,13 +131,13 @@ int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name,
131 return error; 131 return error;
132} 132}
133 133
134void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock) 134void gfs2_lm_put_lock(struct gfs2_sbd *sdp, void *lock)
135{ 135{
136 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 136 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
137 sdp->sd_lockstruct.ls_ops->lm_put_lock(lock); 137 sdp->sd_lockstruct.ls_ops->lm_put_lock(lock);
138} 138}
139 139
140unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock, 140unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, void *lock,
141 unsigned int cur_state, unsigned int req_state, 141 unsigned int cur_state, unsigned int req_state,
142 unsigned int flags) 142 unsigned int flags)
143{ 143{
@@ -148,7 +148,7 @@ unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock,
148 return ret; 148 return ret;
149} 149}
150 150
151unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock, 151unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, void *lock,
152 unsigned int cur_state) 152 unsigned int cur_state)
153{ 153{
154 int ret = 0; 154 int ret = 0;
@@ -157,13 +157,13 @@ unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock,
157 return ret; 157 return ret;
158} 158}
159 159
160void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock) 160void gfs2_lm_cancel(struct gfs2_sbd *sdp, void *lock)
161{ 161{
162 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 162 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
163 sdp->sd_lockstruct.ls_ops->lm_cancel(lock); 163 sdp->sd_lockstruct.ls_ops->lm_cancel(lock);
164} 164}
165 165
166int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp) 166int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, void *lock, char **lvbp)
167{ 167{
168 int error = -EIO; 168 int error = -EIO;
169 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 169 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
@@ -171,7 +171,7 @@ int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp)
171 return error; 171 return error;
172} 172}
173 173
174void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb) 174void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, void *lock, char *lvb)
175{ 175{
176 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags))) 176 if (likely(!test_bit(SDF_SHUTDOWN, &sdp->sd_flags)))
177 sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(lock, lvb); 177 sdp->sd_lockstruct.ls_ops->lm_unhold_lvb(lock, lvb);