diff options
Diffstat (limited to 'fs/gfs2/lm.h')
| -rw-r--r-- | fs/gfs2/lm.h | 25 |
1 files changed, 11 insertions, 14 deletions
diff --git a/fs/gfs2/lm.h b/fs/gfs2/lm.h index 15839aaa4ca6..dbef88852ef3 100644 --- a/fs/gfs2/lm.h +++ b/fs/gfs2/lm.h | |||
| @@ -16,9 +16,9 @@ int gfs2_lm_mount(struct gfs2_sbd *sdp, int silent); | |||
| 16 | void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp); | 16 | void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp); |
| 17 | void gfs2_lm_unmount(struct gfs2_sbd *sdp); | 17 | void gfs2_lm_unmount(struct gfs2_sbd *sdp); |
| 18 | int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) | 18 | int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) |
| 19 | __attribute__ ((format(printf, 2, 3))); | 19 | __attribute__ ((format(printf, 2, 3))); |
| 20 | int gfs2_lm_get_lock(struct gfs2_sbd *sdp, | 20 | int gfs2_lm_get_lock(struct gfs2_sbd *sdp, struct lm_lockname *name, |
| 21 | struct lm_lockname *name, lm_lock_t **lockp); | 21 | lm_lock_t **lockp); |
| 22 | void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock); | 22 | void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock); |
| 23 | unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock, | 23 | unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock, |
| 24 | unsigned int cur_state, unsigned int req_state, | 24 | unsigned int cur_state, unsigned int req_state, |
| @@ -28,16 +28,13 @@ unsigned int gfs2_lm_unlock(struct gfs2_sbd *sdp, lm_lock_t *lock, | |||
| 28 | void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock); | 28 | void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock); |
| 29 | int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp); | 29 | int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp); |
| 30 | void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb); | 30 | void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb); |
| 31 | int gfs2_lm_plock_get(struct gfs2_sbd *sdp, | 31 | int gfs2_lm_plock_get(struct gfs2_sbd *sdp, struct lm_lockname *name, |
| 32 | struct lm_lockname *name, | 32 | struct file *file, struct file_lock *fl); |
| 33 | struct file *file, struct file_lock *fl); | 33 | int gfs2_lm_plock(struct gfs2_sbd *sdp, struct lm_lockname *name, |
| 34 | int gfs2_lm_plock(struct gfs2_sbd *sdp, | 34 | struct file *file, int cmd, struct file_lock *fl); |
| 35 | struct lm_lockname *name, | 35 | int gfs2_lm_punlock(struct gfs2_sbd *sdp, struct lm_lockname *name, |
| 36 | struct file *file, int cmd, struct file_lock *fl); | 36 | struct file *file, struct file_lock *fl); |
| 37 | int gfs2_lm_punlock(struct gfs2_sbd *sdp, | 37 | void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, unsigned int jid, |
| 38 | struct lm_lockname *name, | 38 | unsigned int message); |
| 39 | struct file *file, struct file_lock *fl); | ||
| 40 | void gfs2_lm_recovery_done(struct gfs2_sbd *sdp, | ||
| 41 | unsigned int jid, unsigned int message); | ||
| 42 | 39 | ||
| 43 | #endif /* __LM_DOT_H__ */ | 40 | #endif /* __LM_DOT_H__ */ |