--- zzzz-none-000/linux-2.6.39.4/fs/squashfs/super.c	2011-08-03 19:43:28.000000000 +0000
+++ puma6-atom-6490-729/linux-2.6.39.4/fs/squashfs/super.c	2021-11-10 13:38:17.000000000 +0000
@@ -124,7 +124,7 @@
 	err = -EINVAL;
 
 	/* Check it is a SQUASHFS superblock */
-	sb->s_magic = le32_to_cpu(sblk->s_magic);
+	sb->s_magic = sqsh32_to_cpu(sblk->s_magic);
 	if (sb->s_magic != SQUASHFS_MAGIC) {
 		if (!silent)
 			ERROR("Can't find a SQUASHFS superblock on %s\n",
@@ -134,21 +134,21 @@
 
 	/* Check the MAJOR & MINOR versions and lookup compression type */
 	msblk->decompressor = supported_squashfs_filesystem(
-			le16_to_cpu(sblk->s_major),
-			le16_to_cpu(sblk->s_minor),
-			le16_to_cpu(sblk->compression));
+			sqsh16_to_cpu(sblk->s_major),
+			sqsh16_to_cpu(sblk->s_minor),
+			sqsh16_to_cpu(sblk->compression));
 	if (msblk->decompressor == NULL)
 		goto failed_mount;
 
 	/* Check the filesystem does not extend beyond the end of the
 	   block device */
-	msblk->bytes_used = le64_to_cpu(sblk->bytes_used);
+	msblk->bytes_used = sqsh64_to_cpu(sblk->bytes_used);
 	if (msblk->bytes_used < 0 || msblk->bytes_used >
 			i_size_read(sb->s_bdev->bd_inode))
 		goto failed_mount;
 
 	/* Check block size for sanity */
-	msblk->block_size = le32_to_cpu(sblk->block_size);
+	msblk->block_size = sqsh32_to_cpu(sblk->block_size);
 	if (msblk->block_size > SQUASHFS_FILE_MAX_SIZE)
 		goto failed_mount;
 
@@ -162,19 +162,19 @@
 		goto failed_mount;
 	}
 
-	msblk->block_log = le16_to_cpu(sblk->block_log);
+	msblk->block_log = sqsh16_to_cpu(sblk->block_log);
 	if (msblk->block_log > SQUASHFS_FILE_MAX_LOG)
 		goto failed_mount;
 
 	/* Check the root inode for sanity */
-	root_inode = le64_to_cpu(sblk->root_inode);
+	root_inode = sqsh64_to_cpu(sblk->root_inode);
 	if (SQUASHFS_INODE_OFFSET(root_inode) > SQUASHFS_METADATA_SIZE)
 		goto failed_mount;
 
-	msblk->inode_table = le64_to_cpu(sblk->inode_table_start);
-	msblk->directory_table = le64_to_cpu(sblk->directory_table_start);
-	msblk->inodes = le32_to_cpu(sblk->inodes);
-	flags = le16_to_cpu(sblk->flags);
+	msblk->inode_table = sqsh64_to_cpu(sblk->inode_table_start);
+	msblk->directory_table = sqsh64_to_cpu(sblk->directory_table_start);
+	msblk->inodes = sqsh32_to_cpu(sblk->inodes);
+	flags = sqsh16_to_cpu(sblk->flags);
 
 	TRACE("Found valid superblock on %s\n", bdevname(sb->s_bdev, b));
 	TRACE("Inodes are %scompressed\n", SQUASHFS_UNCOMPRESSED_INODES(flags)
@@ -184,14 +184,14 @@
 	TRACE("Filesystem size %lld bytes\n", msblk->bytes_used);
 	TRACE("Block size %d\n", msblk->block_size);
 	TRACE("Number of inodes %d\n", msblk->inodes);
-	TRACE("Number of fragments %d\n", le32_to_cpu(sblk->fragments));
-	TRACE("Number of ids %d\n", le16_to_cpu(sblk->no_ids));
+	TRACE("Number of fragments %d\n", sqsh32_to_cpu(sblk->fragments));
+	TRACE("Number of ids %d\n", sqsh16_to_cpu(sblk->no_ids));
 	TRACE("sblk->inode_table_start %llx\n", msblk->inode_table);
 	TRACE("sblk->directory_table_start %llx\n", msblk->directory_table);
 	TRACE("sblk->fragment_table_start %llx\n",
-		(u64) le64_to_cpu(sblk->fragment_table_start));
+		(u64) sqsh64_to_cpu(sblk->fragment_table_start));
 	TRACE("sblk->id_table_start %llx\n",
-		(u64) le64_to_cpu(sblk->id_table_start));
+		(u64) sqsh64_to_cpu(sblk->id_table_start));
 
 	sb->s_maxbytes = MAX_LFS_FILESIZE;
 	sb->s_flags |= MS_RDONLY;
@@ -220,14 +220,14 @@
 
 	/* Allocate and read id index table */
 	msblk->id_table = squashfs_read_id_index_table(sb,
-		le64_to_cpu(sblk->id_table_start), le16_to_cpu(sblk->no_ids));
+		sqsh64_to_cpu(sblk->id_table_start), sqsh16_to_cpu(sblk->no_ids));
 	if (IS_ERR(msblk->id_table)) {
 		err = PTR_ERR(msblk->id_table);
 		msblk->id_table = NULL;
 		goto failed_mount;
 	}
 
-	fragments = le32_to_cpu(sblk->fragments);
+	fragments = sqsh32_to_cpu(sblk->fragments);
 	if (fragments == 0)
 		goto allocate_lookup_table;
 
@@ -240,7 +240,7 @@
 
 	/* Allocate and read fragment index table */
 	msblk->fragment_index = squashfs_read_fragment_index_table(sb,
-		le64_to_cpu(sblk->fragment_table_start), fragments);
+		sqsh64_to_cpu(sblk->fragment_table_start), fragments);
 	if (IS_ERR(msblk->fragment_index)) {
 		err = PTR_ERR(msblk->fragment_index);
 		msblk->fragment_index = NULL;
@@ -248,7 +248,7 @@
 	}
 
 allocate_lookup_table:
-	lookup_table_start = le64_to_cpu(sblk->lookup_table_start);
+	lookup_table_start = sqsh64_to_cpu(sblk->lookup_table_start);
 	if (lookup_table_start == SQUASHFS_INVALID_BLK)
 		goto allocate_xattr_table;
 
@@ -265,7 +265,7 @@
 
 allocate_xattr_table:
 	sb->s_xattr = squashfs_xattr_handlers;
-	xattr_id_table_start = le64_to_cpu(sblk->xattr_id_table_start);
+	xattr_id_table_start = sqsh64_to_cpu(sblk->xattr_id_table_start);
 	if (xattr_id_table_start == SQUASHFS_INVALID_BLK)
 		goto allocate_root;