3 files changed, 16 insertions, 19 deletions

diff --git a/fs/gfs2/lock_dlm.c b/fs/gfs2/lock_dlm.c
index c8423d6de6c3..2a6ba06bee6f 100644
--- a/fs/gfs2/lock_dlm.c
+++ b/fs/gfs2/lock_dlm.c
@@ -466,19 +466,19 @@ static void gdlm_cancel(struct gfs2_glock *gl)
 static void control_lvb_read(struct lm_lockstruct *ls, uint32_t *lvb_gen,
                              char *lvb_bits)
 {
-        uint32_t gen;
+        __le32 gen;
         memcpy(lvb_bits, ls->ls_control_lvb, GDLM_LVB_SIZE);
-        memcpy(&gen, lvb_bits, sizeof(uint32_t));
+        memcpy(&gen, lvb_bits, sizeof(__le32));
         *lvb_gen = le32_to_cpu(gen);
 }
 
 static void control_lvb_write(struct lm_lockstruct *ls, uint32_t lvb_gen,
                               char *lvb_bits)
 {
-        uint32_t gen;
+        __le32 gen;
         memcpy(ls->ls_control_lvb, lvb_bits, GDLM_LVB_SIZE);
         gen = cpu_to_le32(lvb_gen);
-        memcpy(ls->ls_control_lvb, &gen, sizeof(uint32_t));
+        memcpy(ls->ls_control_lvb, &gen, sizeof(__le32));
 }
 
 static int all_jid_bits_clear(char *lvb)
diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c
index 453b50eaddec..98236d0df3ca 100644
--- a/fs/gfs2/quota.c
+++ b/fs/gfs2/quota.c
@@ -667,7 +667,7 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
         struct buffer_head *bh;
         struct page *page;
         void *kaddr, *ptr;
-        struct gfs2_quota q, *qp;
+        struct gfs2_quota q;
         int err, nbytes;
         u64 size;
 
@@ -683,28 +683,25 @@ static int gfs2_adjust_quota(struct gfs2_inode *ip, loff_t loc,
                 return err;
 
         err = -EIO;
-        qp = &q;
-        qp->qu_value = be64_to_cpu(qp->qu_value);
-        qp->qu_value += change;
-        qp->qu_value = cpu_to_be64(qp->qu_value);
-        qd->qd_qb.qb_value = qp->qu_value;
+        be64_add_cpu(&q.qu_value, change);
+        qd->qd_qb.qb_value = q.qu_value;
         if (fdq) {
                 if (fdq->d_fieldmask & FS_DQ_BSOFT) {
-                        qp->qu_warn = cpu_to_be64(fdq->d_blk_softlimit >> sdp->sd_fsb2bb_shift);
-                        qd->qd_qb.qb_warn = qp->qu_warn;
+                        q.qu_warn = cpu_to_be64(fdq->d_blk_softlimit >> sdp->sd_fsb2bb_shift);
+                        qd->qd_qb.qb_warn = q.qu_warn;
                 }
                 if (fdq->d_fieldmask & FS_DQ_BHARD) {
-                        qp->qu_limit = cpu_to_be64(fdq->d_blk_hardlimit >> sdp->sd_fsb2bb_shift);
-                        qd->qd_qb.qb_limit = qp->qu_limit;
+                        q.qu_limit = cpu_to_be64(fdq->d_blk_hardlimit >> sdp->sd_fsb2bb_shift);
+                        qd->qd_qb.qb_limit = q.qu_limit;
                 }
                 if (fdq->d_fieldmask & FS_DQ_BCOUNT) {
-                        qp->qu_value = cpu_to_be64(fdq->d_bcount >> sdp->sd_fsb2bb_shift);
-                        qd->qd_qb.qb_value = qp->qu_value;
+                        q.qu_value = cpu_to_be64(fdq->d_bcount >> sdp->sd_fsb2bb_shift);
+                        qd->qd_qb.qb_value = q.qu_value;
                 }
         }
 
         /* Write the quota into the quota file on disk */
-        ptr = qp;
+        ptr = &q;
         nbytes = sizeof(struct gfs2_quota);
 get_a_page:
         page = find_or_create_page(mapping, index, GFP_NOFS);
diff --git a/fs/gfs2/rgrp.c b/fs/gfs2/rgrp.c
index 4d83abdd5635..c8d6161bd682 100644
--- a/fs/gfs2/rgrp.c
+++ b/fs/gfs2/rgrp.c
@@ -1127,7 +1127,7 @@ int gfs2_rgrp_bh_get(struct gfs2_rgrpd *rgd)
                 rgd->rd_flags |= (GFS2_RDF_UPTODATE | GFS2_RDF_CHECK);
                 rgd->rd_free_clone = rgd->rd_free;
         }
-        if (be32_to_cpu(GFS2_MAGIC) != rgd->rd_rgl->rl_magic) {
+        if (cpu_to_be32(GFS2_MAGIC) != rgd->rd_rgl->rl_magic) {
                 rgd->rd_rgl->rl_unlinked = cpu_to_be32(count_unlinked(rgd));
                 gfs2_rgrp_ondisk2lvb(rgd->rd_rgl,
                                      rgd->rd_bits[0].bi_bh->b_data);
@@ -1161,7 +1161,7 @@ int update_rgrp_lvb(struct gfs2_rgrpd *rgd)
         if (rgd->rd_flags & GFS2_RDF_UPTODATE)
                 return 0;
 
-        if (be32_to_cpu(GFS2_MAGIC) != rgd->rd_rgl->rl_magic)
+        if (cpu_to_be32(GFS2_MAGIC) != rgd->rd_rgl->rl_magic)
                 return gfs2_rgrp_bh_get(rgd);
 
         rl_flags = be32_to_cpu(rgd->rd_rgl->rl_flags);