diff options
Diffstat (limited to 'fs/dlm')
-rw-r--r-- | fs/dlm/plock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/dlm/plock.c b/fs/dlm/plock.c index f704458ea5f5..e0ab3a93eeff 100644 --- a/fs/dlm/plock.c +++ b/fs/dlm/plock.c | |||
@@ -30,7 +30,7 @@ struct plock_op { | |||
30 | 30 | ||
31 | struct plock_xop { | 31 | struct plock_xop { |
32 | struct plock_op xop; | 32 | struct plock_op xop; |
33 | void *callback; | 33 | int (*callback)(struct file_lock *fl, int result); |
34 | void *fl; | 34 | void *fl; |
35 | void *file; | 35 | void *file; |
36 | struct file_lock flc; | 36 | struct file_lock flc; |
@@ -190,7 +190,7 @@ static int dlm_plock_callback(struct plock_op *op) | |||
190 | struct file *file; | 190 | struct file *file; |
191 | struct file_lock *fl; | 191 | struct file_lock *fl; |
192 | struct file_lock *flc; | 192 | struct file_lock *flc; |
193 | int (*notify)(void *, void *, int) = NULL; | 193 | int (*notify)(struct file_lock *fl, int result) = NULL; |
194 | struct plock_xop *xop = (struct plock_xop *)op; | 194 | struct plock_xop *xop = (struct plock_xop *)op; |
195 | int rv = 0; | 195 | int rv = 0; |
196 | 196 | ||
@@ -209,7 +209,7 @@ static int dlm_plock_callback(struct plock_op *op) | |||
209 | notify = xop->callback; | 209 | notify = xop->callback; |
210 | 210 | ||
211 | if (op->info.rv) { | 211 | if (op->info.rv) { |
212 | notify(fl, NULL, op->info.rv); | 212 | notify(fl, op->info.rv); |
213 | goto out; | 213 | goto out; |
214 | } | 214 | } |
215 | 215 | ||
@@ -228,7 +228,7 @@ static int dlm_plock_callback(struct plock_op *op) | |||
228 | (unsigned long long)op->info.number, file, fl); | 228 | (unsigned long long)op->info.number, file, fl); |
229 | } | 229 | } |
230 | 230 | ||
231 | rv = notify(fl, NULL, 0); | 231 | rv = notify(fl, 0); |
232 | if (rv) { | 232 | if (rv) { |
233 | /* XXX: We need to cancel the fs lock here: */ | 233 | /* XXX: We need to cancel the fs lock here: */ |
234 | log_print("dlm_plock_callback: lock granted after lock request " | 234 | log_print("dlm_plock_callback: lock granted after lock request " |