Shorten a couple of vars in squashfs_sb_info

6 files changed, 14 insertions, 15 deletions

diff --git a/kernel/fs/squashfs/dir.c b/kernel/fs/squashfs/dir.c
index 84248f4..e2e3601 100644
--- a/kernel/fs/squashfs/dir.c
+++ b/kernel/fs/squashfs/dir.c
@@ -90,7 +90,7 @@ static int get_dir_index_using_offset(struct super_block *sb,
 
 		length = index;
 		*next_block = le32_to_cpu(dir_index.start_block) +
-					msblk->directory_table_start;
+					msblk->directory_table;
 	}
 
 	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
@@ -107,8 +107,7 @@ static int squashfs_readdir(struct file *file, void *dirent, filldir_t filldir)
 {
 	struct inode *inode = file->f_dentry->d_inode;
 	struct squashfs_sb_info *msblk = inode->i_sb->s_fs_info;
-	long long block = SQUASHFS_I(inode)->start +
-				msblk->directory_table_start;
+	long long block = SQUASHFS_I(inode)->start + msblk->directory_table;
 	int offset = SQUASHFS_I(inode)->offset, length = 0, dir_count, size,
 				type, err;
 	unsigned int inode_number;
diff --git a/kernel/fs/squashfs/file.c b/kernel/fs/squashfs/file.c
index 99679fa..145708e 100644
--- a/kernel/fs/squashfs/file.c
+++ b/kernel/fs/squashfs/file.c
@@ -266,7 +266,7 @@ static int fill_meta_index(struct inode *inode, int index,
 				meta->offset + meta->entries - 1;
 			meta_entry = &meta->meta_entry[offset - meta->offset];
 			cur_index_block = meta_entry->index_block +
-				msblk->inode_table_start;
+				msblk->inode_table;
 			cur_offset = meta_entry->offset;
 			cur_data_block = meta_entry->data_block;
 			TRACE("get_meta_index: offset %d, meta->offset %d, "
@@ -302,7 +302,7 @@ static int fill_meta_index(struct inode *inode, int index,
 			cur_data_block += res;
 			meta_entry = &meta->meta_entry[i - meta->offset];
 			meta_entry->index_block = cur_index_block -
-				msblk->inode_table_start;
+				msblk->inode_table;
 			meta_entry->offset = cur_offset;
 			meta_entry->data_block = cur_data_block;
 			meta->entries++;
diff --git a/kernel/fs/squashfs/inode.c b/kernel/fs/squashfs/inode.c
index c532b88..ca91e88 100644
--- a/kernel/fs/squashfs/inode.c
+++ b/kernel/fs/squashfs/inode.c
@@ -109,7 +109,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
 {
 	struct super_block *sb = inode->i_sb;
 	struct squashfs_sb_info *msblk = sb->s_fs_info;
-	long long block = SQUASHFS_INODE_BLK(ino) + msblk->inode_table_start;
+	long long block = SQUASHFS_INODE_BLK(ino) + msblk->inode_table;
 	unsigned int offset = SQUASHFS_INODE_OFFSET(ino);
 	int err, type;
 	union squashfs_inode squashfs_ino;
@@ -129,7 +129,7 @@ int squashfs_read_inode(struct inode *inode, long long ino)
 	if (err)
 		goto failed_read;
 
-	block = SQUASHFS_INODE_BLK(ino) + msblk->inode_table_start;
+	block = SQUASHFS_INODE_BLK(ino) + msblk->inode_table;
 	offset = SQUASHFS_INODE_OFFSET(ino);
 
 	type = le16_to_cpu(sqsh_ino->inode_type);
diff --git a/kernel/fs/squashfs/namei.c b/kernel/fs/squashfs/namei.c
index ba026de..2abb2e6 100644
--- a/kernel/fs/squashfs/namei.c
+++ b/kernel/fs/squashfs/namei.c
@@ -115,7 +115,7 @@ static int get_dir_index_using_name(struct super_block *sb,
 
 		length = le32_to_cpu(index->index);
 		*next_block = le32_to_cpu(index->start_block) +
-					msblk->directory_table_start;
+					msblk->directory_table;
 	}
 
 	*next_offset = (length + *next_offset) % SQUASHFS_METADATA_SIZE;
@@ -141,7 +141,7 @@ static struct dentry *squashfs_lookup(struct inode *dir, struct dentry *dentry,
 	struct squashfs_sb_info *msblk = dir->i_sb->s_fs_info;
 	struct squashfs_dir_header dirh;
 	struct squashfs_dir_entry *dire;
-	long long block = SQUASHFS_I(dir)->start + msblk->directory_table_start;
+	long long block = SQUASHFS_I(dir)->start + msblk->directory_table;
 	int offset = SQUASHFS_I(dir)->offset;
 	int err, length = 0, dir_count, size;
 
@@ -230,7 +230,7 @@ exit_lookup:
 
 read_failure:
 	ERROR("Unable to read directory block [%llx:%x]\n", 
-		SQUASHFS_I(dir)->start + msblk->directory_table_start,
+		SQUASHFS_I(dir)->start + msblk->directory_table,
 		SQUASHFS_I(dir)->offset);
 failure:
 	return ERR_PTR(err);
diff --git a/kernel/fs/squashfs/super.c b/kernel/fs/squashfs/super.c
index d80abf2..065605f 100644
--- a/kernel/fs/squashfs/super.c
+++ b/kernel/fs/squashfs/super.c
@@ -162,8 +162,8 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
 	if (SQUASHFS_INODE_OFFSET(root_inode) > SQUASHFS_METADATA_SIZE)
 		goto failed_mount;
 
-	msblk->inode_table_start = le64_to_cpu(sblk->inode_table_start);
-	msblk->directory_table_start = le64_to_cpu(sblk->directory_table_start);
+	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);
 
@@ -177,7 +177,7 @@ static int squashfs_fill_super(struct super_block *sb, void *data, int silent)
 	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("sblk->inode_table_start %llx\n", msblk->inode_table_start);
+	TRACE("sblk->inode_table_start %llx\n", msblk->inode_table);
 	TRACE("sblk->directory_table_start %llx\n",
 				msblk->directory_table_start);
 	TRACE("sblk->fragment_table_start %llx\n",
diff --git a/kernel/include/linux/squashfs_fs_sb.h b/kernel/include/linux/squashfs_fs_sb.h
index 9bfe29c..8990547 100644
--- a/kernel/include/linux/squashfs_fs_sb.h
+++ b/kernel/include/linux/squashfs_fs_sb.h
@@ -66,8 +66,8 @@ struct squashfs_sb_info {
 	struct meta_index	*meta_index;
 	z_stream		stream;
 	__le64			*inode_lookup_table;
-	long long		inode_table_start;
-	long long		directory_table_start;
+	long long		inode_table;
+	long long		directory_table;
 	unsigned int		block_size;
 	unsigned short		block_log;
 	long long		bytes_used;