[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>

3 files changed, 12 insertions, 12 deletions

diff --git a/fs/gfs2/locking/dlm/lock.c b/fs/gfs2/locking/dlm/lock.c
index 1f15b6e8b2..dceea419b9 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)
 
 /* convert gfs lock-state to dlm lock-mode */
 
-static int16_t make_mode(int16_t lmstate)
+static s16 make_mode(s16 lmstate)
 {
         switch (lmstate) {
         case LM_ST_UNLOCKED:
@@ -79,7 +79,7 @@ static int16_t make_mode(int16_t lmstate)
 
 /* convert dlm lock-mode to gfs lock-state */
 
-int16_t gdlm_make_lmstate(int16_t dlmmode)
+s16 gdlm_make_lmstate(s16 dlmmode)
 {
         switch (dlmmode) {
         case DLM_LOCK_IV:
@@ -101,14 +101,14 @@ int16_t gdlm_make_lmstate(int16_t dlmmode)
 
 static void check_cur_state(struct gdlm_lock *lp, unsigned int cur_state)
 {
-        int16_t cur = make_mode(cur_state);
+        s16 cur = make_mode(cur_state);
         if (lp->cur != DLM_LOCK_IV)
                 gdlm_assert(lp->cur == cur, "%d, %d", lp->cur, cur);
 }
 
 static inline unsigned int make_flags(struct gdlm_lock *lp,
                                       unsigned int gfs_flags,
-                                      int16_t cur, int16_t req)
+                                      s16 cur, s16 req)
 {
         unsigned int lkf = 0;
 
diff --git a/fs/gfs2/locking/dlm/lock_dlm.h b/fs/gfs2/locking/dlm/lock_dlm.h
index 9410634985..c7b6e37025 100644
--- a/fs/gfs2/locking/dlm/lock_dlm.h
+++ b/fs/gfs2/locking/dlm/lock_dlm.h
@@ -56,7 +56,7 @@ enum {
 };
 
 struct gdlm_ls {
-        uint32_t                id;
+        u32             id;
         int                     jid;
         int                     first;
         int                     first_done;
@@ -77,7 +77,7 @@ struct gdlm_ls {
         struct list_head        delayed;
         struct list_head        submit;
         struct list_head        all_locks;
-        uint32_t                all_locks_count;
+        u32             all_locks_count;
         wait_queue_head_t       wait_control;
         struct task_struct      *thread1;
         struct task_struct      *thread2;
@@ -109,10 +109,10 @@ struct gdlm_lock {
         char                    *lvb;
         struct dlm_lksb         lksb;
 
-        int16_t                 cur;
-        int16_t                 req;
-        int16_t                 prev_req;
-        uint32_t                lkf;            /* dlm flags DLM_LKF_ */
+        s16                     cur;
+        s16                     req;
+        s16                     prev_req;
+        u32             lkf;            /* dlm flags DLM_LKF_ */
         unsigned long           flags;          /* lock_dlm flags LFL_ */
 
         int                     bast_mode;      /* protected by async_lock */
@@ -158,7 +158,7 @@ void gdlm_release_threads(struct gdlm_ls *);
 
 /* lock.c */
 
-int16_t gdlm_make_lmstate(int16_t);
+s16 gdlm_make_lmstate(s16);
 void gdlm_queue_delayed(struct gdlm_lock *);
 void gdlm_submit_delayed(struct gdlm_ls *);
 int gdlm_release_all_locks(struct gdlm_ls *);
diff --git a/fs/gfs2/locking/dlm/thread.c b/fs/gfs2/locking/dlm/thread.c
index a782246d66..d4895ec242 100644
--- a/fs/gfs2/locking/dlm/thread.c
+++ b/fs/gfs2/locking/dlm/thread.c
@@ -48,7 +48,7 @@ static void process_complete(struct gdlm_lock *lp)
 {
         struct gdlm_ls *ls = lp->ls;
         struct lm_async_cb acb;
-        int16_t prev_mode = lp->cur;
+        s16 prev_mode = lp->cur;
 
         memset(&acb, 0, sizeof(acb));