aboutsummaryrefslogtreecommitdiffstats
path: root/fs/gfs2/lm.h
diff options
context:
space:
mode:
authorSteven Whitehouse <swhiteho@redhat.com>2006-09-04 09:49:55 -0400
committerSteven Whitehouse <swhiteho@redhat.com>2006-09-04 09:49:55 -0400
commit5029996547a9f3988459e11955c13259495308ef (patch)
tree4667c98c19a6f39dc820e4eb648ecfa03b29bce2 /fs/gfs2/lm.h
parente9fc2aa091ab8fa46e60d4c9d06a89305c441652 (diff)
[GFS2] Tidy up locking code
As per Jan Engelhardt's second email, this removes some unused code, and fixes up indenting in various places. Cc: Jan Engelhardt <jengelh@linux01.gwdg.de> Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/lm.h')
-rw-r--r--fs/gfs2/lm.h25
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);
16void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp); 16void gfs2_lm_others_may_mount(struct gfs2_sbd *sdp);
17void gfs2_lm_unmount(struct gfs2_sbd *sdp); 17void gfs2_lm_unmount(struct gfs2_sbd *sdp);
18int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...) 18int gfs2_lm_withdraw(struct gfs2_sbd *sdp, char *fmt, ...)
19__attribute__ ((format(printf, 2, 3))); 19 __attribute__ ((format(printf, 2, 3)));
20int gfs2_lm_get_lock(struct gfs2_sbd *sdp, 20int 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);
22void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock); 22void gfs2_lm_put_lock(struct gfs2_sbd *sdp, lm_lock_t *lock);
23unsigned int gfs2_lm_lock(struct gfs2_sbd *sdp, lm_lock_t *lock, 23unsigned 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,
28void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock); 28void gfs2_lm_cancel(struct gfs2_sbd *sdp, lm_lock_t *lock);
29int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp); 29int gfs2_lm_hold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char **lvbp);
30void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb); 30void gfs2_lm_unhold_lvb(struct gfs2_sbd *sdp, lm_lock_t *lock, char *lvb);
31int gfs2_lm_plock_get(struct gfs2_sbd *sdp, 31int 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); 33int gfs2_lm_plock(struct gfs2_sbd *sdp, struct lm_lockname *name,
34int gfs2_lm_plock(struct gfs2_sbd *sdp, 34 struct file *file, int cmd, struct file_lock *fl);
35 struct lm_lockname *name, 35int 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);
37int gfs2_lm_punlock(struct gfs2_sbd *sdp, 37void 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);
40void 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__ */