diff options
author | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 12:49:07 -0400 |
---|---|---|
committer | Steven Whitehouse <swhiteho@redhat.com> | 2006-09-04 12:49:07 -0400 |
commit | cd915493fce912f1bd838ee1250737ecf33b8fae (patch) | |
tree | e14ec6643de91f473edb26a89905e710596fe6bc /fs/gfs2/locking/dlm/lock.c | |
parent | a91ea69ffd3f8a0b7139bfd44042ab384461e631 (diff) |
[GFS2] Change all types to uX style
This makes all fixed size types have consistent names.
Cc: Jan Engelhardt <jengelh@linux01.gwdg.de>
Signed-off-by: Steven Whitehouse <swhiteho@redhat.com>
Diffstat (limited to 'fs/gfs2/locking/dlm/lock.c')
-rw-r--r-- | fs/gfs2/locking/dlm/lock.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c index 1f15b6e8b2cf..dceea419b94b 100644 --- a/fs/gfs2/locking/dlm/lock.c +++ b/fs/gfs2/locking/dlm/lock.c | |||
@@ -61,7 +61,7 @@ void gdlm_queue_delayed(struct gdlm_lock *lp) | |||
61 | 61 | ||
62 | /* convert gfs lock-state to dlm lock-mode */ | 62 | /* convert gfs lock-state to dlm lock-mode */ |
63 | 63 | ||
64 | static int16_t make_mode(int16_t lmstate) | 64 | static s16 make_mode(s16 lmstate) |
65 | { | 65 | { |
66 | switch (lmstate) { | 66 | switch (lmstate) { |
67 | case LM_ST_UNLOCKED: | 67 | case LM_ST_UNLOCKED: |
@@ -79,7 +79,7 @@ static int16_t make_mode(int16_t lmstate) | |||
79 | 79 | ||
80 | /* convert dlm lock-mode to gfs lock-state */ | 80 | /* convert dlm lock-mode to gfs lock-state */ |
81 | 81 | ||
82 | int16_t gdlm_make_lmstate(int16_t dlmmode) | 82 | s16 gdlm_make_lmstate(s16 dlmmode) |
83 | { | 83 | { |
84 | switch (dlmmode) { | 84 | switch (dlmmode) { |
85 | case DLM_LOCK_IV: | 85 | case DLM_LOCK_IV: |
@@ -101,14 +101,14 @@ int16_t gdlm_make_lmstate(int16_t dlmmode) | |||
101 | 101 | ||
102 | static void check_cur_state(struct gdlm_lock *lp, unsigned int cur_state) | 102 | static void check_cur_state(struct gdlm_lock *lp, unsigned int cur_state) |
103 | { | 103 | { |
104 | int16_t cur = make_mode(cur_state); | 104 | s16 cur = make_mode(cur_state); |
105 | if (lp->cur != DLM_LOCK_IV) | 105 | if (lp->cur != DLM_LOCK_IV) |
106 | gdlm_assert(lp->cur == cur, "%d, %d", lp->cur, cur); | 106 | gdlm_assert(lp->cur == cur, "%d, %d", lp->cur, cur); |
107 | } | 107 | } |
108 | 108 | ||
109 | static inline unsigned int make_flags(struct gdlm_lock *lp, | 109 | static inline unsigned int make_flags(struct gdlm_lock *lp, |
110 | unsigned int gfs_flags, | 110 | unsigned int gfs_flags, |
111 | int16_t cur, int16_t req) | 111 | s16 cur, s16 req) |
112 | { | 112 | { |
113 | unsigned int lkf = 0; | 113 | unsigned int lkf = 0; |
114 | 114 | ||