--- zzzz-none-000/linux-2.6.39.4/fs/squashfs/inode.c 2011-08-03 19:43:28.000000000 +0000 +++ puma6-arm-6490-729/linux-2.6.39.4/fs/squashfs/inode.c 2021-11-10 13:23:10.000000000 +0000 @@ -58,19 +58,19 @@ { int err; - err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->uid), &inode->i_uid); + err = squashfs_get_id(sb, sqsh16_to_cpu(sqsh_ino->uid), &inode->i_uid); if (err) return err; - err = squashfs_get_id(sb, le16_to_cpu(sqsh_ino->guid), &inode->i_gid); + err = squashfs_get_id(sb, sqsh16_to_cpu(sqsh_ino->guid), &inode->i_gid); if (err) return err; - inode->i_ino = le32_to_cpu(sqsh_ino->inode_number); - inode->i_mtime.tv_sec = le32_to_cpu(sqsh_ino->mtime); + inode->i_ino = sqsh32_to_cpu(sqsh_ino->inode_number); + inode->i_mtime.tv_sec = sqsh32_to_cpu(sqsh_ino->mtime); inode->i_atime.tv_sec = inode->i_mtime.tv_sec; inode->i_ctime.tv_sec = inode->i_mtime.tv_sec; - inode->i_mode = le16_to_cpu(sqsh_ino->mode); + inode->i_mode = sqsh16_to_cpu(sqsh_ino->mode); inode->i_size = 0; return err; @@ -132,7 +132,7 @@ block = SQUASHFS_INODE_BLK(ino) + msblk->inode_table; offset = SQUASHFS_INODE_OFFSET(ino); - type = le16_to_cpu(sqshb_ino->inode_type); + type = sqsh16_to_cpu(sqshb_ino->inode_type); switch (type) { case SQUASHFS_REG_TYPE: { unsigned int frag_offset, frag; @@ -145,9 +145,9 @@ if (err < 0) goto failed_read; - frag = le32_to_cpu(sqsh_ino->fragment); + frag = sqsh32_to_cpu(sqsh_ino->fragment); if (frag != SQUASHFS_INVALID_FRAG) { - frag_offset = le32_to_cpu(sqsh_ino->offset); + frag_offset = sqsh32_to_cpu(sqsh_ino->offset); frag_size = squashfs_frag_lookup(sb, frag, &frag_blk); if (frag_size < 0) { err = frag_size; @@ -160,14 +160,14 @@ } inode->i_nlink = 1; - inode->i_size = le32_to_cpu(sqsh_ino->file_size); + inode->i_size = sqsh32_to_cpu(sqsh_ino->file_size); inode->i_fop = &generic_ro_fops; inode->i_mode |= S_IFREG; inode->i_blocks = ((inode->i_size - 1) >> 9) + 1; squashfs_i(inode)->fragment_block = frag_blk; squashfs_i(inode)->fragment_size = frag_size; squashfs_i(inode)->fragment_offset = frag_offset; - squashfs_i(inode)->start = le32_to_cpu(sqsh_ino->start_block); + squashfs_i(inode)->start = sqsh32_to_cpu(sqsh_ino->start_block); squashfs_i(inode)->block_list_start = block; squashfs_i(inode)->offset = offset; inode->i_data.a_ops = &squashfs_aops; @@ -188,9 +188,9 @@ if (err < 0) goto failed_read; - frag = le32_to_cpu(sqsh_ino->fragment); + frag = sqsh32_to_cpu(sqsh_ino->fragment); if (frag != SQUASHFS_INVALID_FRAG) { - frag_offset = le32_to_cpu(sqsh_ino->offset); + frag_offset = sqsh32_to_cpu(sqsh_ino->offset); frag_size = squashfs_frag_lookup(sb, frag, &frag_blk); if (frag_size < 0) { err = frag_size; @@ -202,19 +202,19 @@ frag_offset = 0; } - xattr_id = le32_to_cpu(sqsh_ino->xattr); - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); - inode->i_size = le64_to_cpu(sqsh_ino->file_size); + xattr_id = sqsh32_to_cpu(sqsh_ino->xattr); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); + inode->i_size = sqsh64_to_cpu(sqsh_ino->file_size); inode->i_op = &squashfs_inode_ops; inode->i_fop = &generic_ro_fops; inode->i_mode |= S_IFREG; inode->i_blocks = ((inode->i_size - - le64_to_cpu(sqsh_ino->sparse) - 1) >> 9) + 1; + sqsh64_to_cpu(sqsh_ino->sparse) - 1) >> 9) + 1; squashfs_i(inode)->fragment_block = frag_blk; squashfs_i(inode)->fragment_size = frag_size; squashfs_i(inode)->fragment_offset = frag_offset; - squashfs_i(inode)->start = le64_to_cpu(sqsh_ino->start_block); + squashfs_i(inode)->start = sqsh64_to_cpu(sqsh_ino->start_block); squashfs_i(inode)->block_list_start = block; squashfs_i(inode)->offset = offset; inode->i_data.a_ops = &squashfs_aops; @@ -232,20 +232,20 @@ if (err < 0) goto failed_read; - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); - inode->i_size = le16_to_cpu(sqsh_ino->file_size); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); + inode->i_size = sqsh16_to_cpu(sqsh_ino->file_size); inode->i_op = &squashfs_dir_inode_ops; inode->i_fop = &squashfs_dir_ops; inode->i_mode |= S_IFDIR; - squashfs_i(inode)->start = le32_to_cpu(sqsh_ino->start_block); - squashfs_i(inode)->offset = le16_to_cpu(sqsh_ino->offset); + squashfs_i(inode)->start = sqsh32_to_cpu(sqsh_ino->start_block); + squashfs_i(inode)->offset = sqsh16_to_cpu(sqsh_ino->offset); squashfs_i(inode)->dir_idx_cnt = 0; - squashfs_i(inode)->parent = le32_to_cpu(sqsh_ino->parent_inode); + squashfs_i(inode)->parent = sqsh32_to_cpu(sqsh_ino->parent_inode); TRACE("Directory inode %x:%x, start_block %llx, offset %x\n", SQUASHFS_INODE_BLK(ino), offset, squashfs_i(inode)->start, - le16_to_cpu(sqsh_ino->offset)); + sqsh16_to_cpu(sqsh_ino->offset)); break; } case SQUASHFS_LDIR_TYPE: { @@ -256,23 +256,23 @@ if (err < 0) goto failed_read; - xattr_id = le32_to_cpu(sqsh_ino->xattr); - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); - inode->i_size = le32_to_cpu(sqsh_ino->file_size); + xattr_id = sqsh32_to_cpu(sqsh_ino->xattr); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); + inode->i_size = sqsh32_to_cpu(sqsh_ino->file_size); inode->i_op = &squashfs_dir_inode_ops; inode->i_fop = &squashfs_dir_ops; inode->i_mode |= S_IFDIR; - squashfs_i(inode)->start = le32_to_cpu(sqsh_ino->start_block); - squashfs_i(inode)->offset = le16_to_cpu(sqsh_ino->offset); + squashfs_i(inode)->start = sqsh32_to_cpu(sqsh_ino->start_block); + squashfs_i(inode)->offset = sqsh16_to_cpu(sqsh_ino->offset); squashfs_i(inode)->dir_idx_start = block; squashfs_i(inode)->dir_idx_offset = offset; - squashfs_i(inode)->dir_idx_cnt = le16_to_cpu(sqsh_ino->i_count); - squashfs_i(inode)->parent = le32_to_cpu(sqsh_ino->parent_inode); + squashfs_i(inode)->dir_idx_cnt = sqsh16_to_cpu(sqsh_ino->i_count); + squashfs_i(inode)->parent = sqsh32_to_cpu(sqsh_ino->parent_inode); TRACE("Long directory inode %x:%x, start_block %llx, offset " "%x\n", SQUASHFS_INODE_BLK(ino), offset, squashfs_i(inode)->start, - le16_to_cpu(sqsh_ino->offset)); + sqsh16_to_cpu(sqsh_ino->offset)); break; } case SQUASHFS_SYMLINK_TYPE: @@ -284,8 +284,8 @@ if (err < 0) goto failed_read; - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); - inode->i_size = le32_to_cpu(sqsh_ino->symlink_size); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); + inode->i_size = sqsh32_to_cpu(sqsh_ino->symlink_size); inode->i_op = &squashfs_symlink_inode_ops; inode->i_data.a_ops = &squashfs_symlink_aops; inode->i_mode |= S_IFLNK; @@ -303,7 +303,7 @@ &offset, sizeof(xattr)); if (err < 0) goto failed_read; - xattr_id = le32_to_cpu(xattr); + xattr_id = sqsh32_to_cpu(xattr); } TRACE("Symbolic link inode %x:%x, start_block %llx, offset " @@ -325,8 +325,8 @@ inode->i_mode |= S_IFCHR; else inode->i_mode |= S_IFBLK; - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); - rdev = le32_to_cpu(sqsh_ino->rdev); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); + rdev = sqsh32_to_cpu(sqsh_ino->rdev); init_special_inode(inode, inode->i_mode, new_decode_dev(rdev)); TRACE("Device inode %x:%x, rdev %x\n", @@ -347,10 +347,10 @@ inode->i_mode |= S_IFCHR; else inode->i_mode |= S_IFBLK; - xattr_id = le32_to_cpu(sqsh_ino->xattr); + xattr_id = sqsh32_to_cpu(sqsh_ino->xattr); inode->i_op = &squashfs_inode_ops; - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); - rdev = le32_to_cpu(sqsh_ino->rdev); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); + rdev = sqsh32_to_cpu(sqsh_ino->rdev); init_special_inode(inode, inode->i_mode, new_decode_dev(rdev)); TRACE("Device inode %x:%x, rdev %x\n", @@ -370,7 +370,7 @@ inode->i_mode |= S_IFIFO; else inode->i_mode |= S_IFSOCK; - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); init_special_inode(inode, inode->i_mode, 0); break; } @@ -387,9 +387,9 @@ inode->i_mode |= S_IFIFO; else inode->i_mode |= S_IFSOCK; - xattr_id = le32_to_cpu(sqsh_ino->xattr); + xattr_id = sqsh32_to_cpu(sqsh_ino->xattr); inode->i_op = &squashfs_inode_ops; - inode->i_nlink = le32_to_cpu(sqsh_ino->nlink); + inode->i_nlink = sqsh32_to_cpu(sqsh_ino->nlink); init_special_inode(inode, inode->i_mode, 0); break; }