6 files changed, 15 insertions, 13 deletions

diff --git a/fs/ubifs/debug.c b/fs/ubifs/debug.c
index 7186400750e7..f9deccbc90c0 100644
--- a/fs/ubifs/debug.c
+++ b/fs/ubifs/debug.c
@@ -364,8 +364,8 @@ void dbg_dump_node(const struct ubifs_info *c, const void *node)
                        le32_to_cpu(mst->ihead_lnum));
                 printk(KERN_DEBUG "\tihead_offs     %u\n",
                        le32_to_cpu(mst->ihead_offs));
-                printk(KERN_DEBUG "\tindex_size     %u\n",
-                       le32_to_cpu(mst->index_size));
+                printk(KERN_DEBUG "\tindex_size     %llu\n",
+                       (unsigned long long)le64_to_cpu(mst->index_size));
                 printk(KERN_DEBUG "\tlpt_lnum       %u\n",
                        le32_to_cpu(mst->lpt_lnum));
                 printk(KERN_DEBUG "\tlpt_offs       %u\n",
diff --git a/fs/ubifs/dir.c b/fs/ubifs/dir.c
index 526c01ec8003..37a9e604c3e9 100644
--- a/fs/ubifs/dir.c
+++ b/fs/ubifs/dir.c
@@ -428,7 +428,8 @@ static int ubifs_readdir(struct file *file, void *dirent, filldir_t filldir)
                 dbg_gen("feed '%s', ino %llu, new f_pos %#x",
                         dent->name, (unsigned long long)le64_to_cpu(dent->inum),
                         key_hash_flash(c, &dent->key));
-                ubifs_assert(dent->ch.sqnum > ubifs_inode(dir)->creat_sqnum);
+                ubifs_assert(le64_to_cpu(dent->ch.sqnum) >
+                             ubifs_inode(dir)->creat_sqnum);
 
                 nm.len = le16_to_cpu(dent->nlen);
                 over = filldir(dirent, dent->name, nm.len, file->f_pos,
diff --git a/fs/ubifs/file.c b/fs/ubifs/file.c
index 51cf511d44d9..9124eee73aea 100644
--- a/fs/ubifs/file.c
+++ b/fs/ubifs/file.c
@@ -72,7 +72,7 @@ static int read_block(struct inode *inode, void *addr, unsigned int block,
                 return err;
         }
 
-        ubifs_assert(dn->ch.sqnum > ubifs_inode(inode)->creat_sqnum);
+        ubifs_assert(le64_to_cpu(dn->ch.sqnum) > ubifs_inode(inode)->creat_sqnum);
 
         len = le32_to_cpu(dn->size);
         if (len <= 0 || len > UBIFS_BLOCK_SIZE)
@@ -626,7 +626,7 @@ static int populate_page(struct ubifs_info *c, struct page *page,
 
                         dn = bu->buf + (bu->zbranch[nn].offs - offs);
 
-                        ubifs_assert(dn->ch.sqnum >
+                        ubifs_assert(le64_to_cpu(dn->ch.sqnum) >
                                      ubifs_inode(inode)->creat_sqnum);
 
                         len = le32_to_cpu(dn->size);
diff --git a/fs/ubifs/key.h b/fs/ubifs/key.h
index 9ee65086f627..3f1f16bc25c9 100644
--- a/fs/ubifs/key.h
+++ b/fs/ubifs/key.h
@@ -345,7 +345,7 @@ static inline int key_type_flash(const struct ubifs_info *c, const void *k)
 {
         const union ubifs_key *key = k;
 
-        return le32_to_cpu(key->u32[1]) >> UBIFS_S_KEY_BLOCK_BITS;
+        return le32_to_cpu(key->j32[1]) >> UBIFS_S_KEY_BLOCK_BITS;
 }
 
 /**
@@ -416,7 +416,7 @@ static inline unsigned int key_block_flash(const struct ubifs_info *c,
 {
         const union ubifs_key *key = k;
 
-        return le32_to_cpu(key->u32[1]) & UBIFS_S_KEY_BLOCK_MASK;
+        return le32_to_cpu(key->j32[1]) & UBIFS_S_KEY_BLOCK_MASK;
 }
 
 /**
diff --git a/fs/ubifs/recovery.c b/fs/ubifs/recovery.c
index 77d26c141cf6..bed97421b972 100644
--- a/fs/ubifs/recovery.c
+++ b/fs/ubifs/recovery.c
@@ -168,12 +168,12 @@ static int write_rcvrd_mst_node(struct ubifs_info *c,
                                 struct ubifs_mst_node *mst)
 {
         int err = 0, lnum = UBIFS_MST_LNUM, sz = c->mst_node_alsz;
-        uint32_t save_flags;
+        __le32 save_flags;
 
         dbg_rcvry("recovery");
 
         save_flags = mst->flags;
-        mst->flags = cpu_to_le32(le32_to_cpu(mst->flags) | UBIFS_MST_RCVRY);
+        mst->flags |= cpu_to_le32(UBIFS_MST_RCVRY);
 
         ubifs_prepare_node(c, mst, UBIFS_MST_NODE_SZ, 1);
         err = ubi_leb_change(c->ubi, lnum, mst, sz, UBI_SHORTTERM);
diff --git a/fs/ubifs/sb.c b/fs/ubifs/sb.c
index 2bf753b38889..0f392351dc5a 100644
--- a/fs/ubifs/sb.c
+++ b/fs/ubifs/sb.c
@@ -81,6 +81,7 @@ static int create_default_filesystem(struct ubifs_info *c)
         int lpt_lebs, lpt_first, orph_lebs, big_lpt, ino_waste, sup_flags = 0;
         int min_leb_cnt = UBIFS_MIN_LEB_CNT;
         uint64_t tmp64, main_bytes;
+        __le64 tmp_le64;
 
         /* Some functions called from here depend on the @c->key_len filed */
         c->key_len = UBIFS_SK_LEN;
@@ -295,10 +296,10 @@ static int create_default_filesystem(struct ubifs_info *c)
         ino->ch.node_type = UBIFS_INO_NODE;
         ino->creat_sqnum = cpu_to_le64(++c->max_sqnum);
         ino->nlink = cpu_to_le32(2);
-        tmp = cpu_to_le64(CURRENT_TIME_SEC.tv_sec);
-        ino->atime_sec   = tmp;
-        ino->ctime_sec   = tmp;
-        ino->mtime_sec   = tmp;
+        tmp_le64 = cpu_to_le64(CURRENT_TIME_SEC.tv_sec);
+        ino->atime_sec   = tmp_le64;
+        ino->ctime_sec   = tmp_le64;
+        ino->mtime_sec   = tmp_le64;
         ino->atime_nsec  = 0;
         ino->ctime_nsec  = 0;
         ino->mtime_nsec  = 0;