From 5bcfb0f31d20a4687e33346eb4f3964e5a679a64 Mon Sep 17 00:00:00 2001 From: Willy Tarreau Date: Sat, 7 Aug 2010 20:47:00 +0200 Subject: squashfs3: struct types meta_* clash with squashfs v4 --- fs/squashfs3/inode.c | 16 ++++++++-------- include/linux/squashfs3_fs.h | 6 +++--- include/linux/squashfs3_fs_sb.h | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/fs/squashfs3/inode.c b/fs/squashfs3/inode.c index 18af1a9..d2fe251 100644 --- a/fs/squashfs3/inode.c +++ b/fs/squashfs3/inode.c @@ -1347,9 +1347,9 @@ skip_read: } -static struct meta_index *locate_meta_index(struct inode *inode, int index, int offset) +static struct squashfs3_meta_index *locate_meta_index(struct inode *inode, int index, int offset) { - struct meta_index *meta = NULL; + struct squashfs3_meta_index *meta = NULL; struct squashfs3_sb_info *msblk = inode->i_sb->s_fs_info; int i; @@ -1382,10 +1382,10 @@ not_allocated: } -static struct meta_index *empty_meta_index(struct inode *inode, int offset, int skip) +static struct squashfs3_meta_index *empty_meta_index(struct inode *inode, int offset, int skip) { struct squashfs3_sb_info *msblk = inode->i_sb->s_fs_info; - struct meta_index *meta = NULL; + struct squashfs3_meta_index *meta = NULL; int i; mutex_lock(&msblk->meta_index_mutex); @@ -1393,7 +1393,7 @@ static struct meta_index *empty_meta_index(struct inode *inode, int offset, int TRACE("empty_meta_index: offset %d, skip %d\n", offset, skip); if (msblk->meta_index == NULL) { - msblk->meta_index = kmalloc(sizeof(struct meta_index) * + msblk->meta_index = kmalloc(sizeof(struct squashfs3_meta_index) * SQUASHFS3_META_NUMBER, GFP_KERNEL); if (msblk->meta_index == NULL) { ERROR("Failed to allocate meta_index\n"); @@ -1436,7 +1436,7 @@ failed: } -static void release_meta_index(struct inode *inode, struct meta_index *meta) +static void release_meta_index(struct inode *inode, struct squashfs3_meta_index *meta) { meta->locked = 0; smp_mb(); @@ -1495,8 +1495,8 @@ static int get_meta_index(struct inode *inode, int index, struct squashfs3_super_block *sblk = &msblk->sblk; int skip = calculate_skip(i_size_read(inode) >> sblk->block_log); int offset = 0; - struct meta_index *meta; - struct meta_entry *meta_entry; + struct squashfs3_meta_index *meta; + struct squashfs3_meta_entry *meta_entry; long long cur_index_block = SQUASHFS3_I(inode)->u.s1.block_list_start; int cur_offset = SQUASHFS3_I(inode)->offset; long long cur_data_block = SQUASHFS3_I(inode)->start_block; diff --git a/include/linux/squashfs3_fs.h b/include/linux/squashfs3_fs.h index a2544ab..c84150c 100644 --- a/include/linux/squashfs3_fs.h +++ b/include/linux/squashfs3_fs.h @@ -196,21 +196,21 @@ #define SQUASHFS3_META_NUMBER 8 #define SQUASHFS3_SLOTS 4 -struct meta_entry { +struct squashfs3_meta_entry { long long data_block; unsigned int index_block; unsigned short offset; unsigned short pad; }; -struct meta_index { +struct squashfs3_meta_index { unsigned int inode_number; unsigned int offset; unsigned short entries; unsigned short skip; unsigned short locked; unsigned short pad; - struct meta_entry meta_entry[SQUASHFS3_META_ENTRIES]; + struct squashfs3_meta_entry meta_entry[SQUASHFS3_META_ENTRIES]; }; diff --git a/include/linux/squashfs3_fs_sb.h b/include/linux/squashfs3_fs_sb.h index 18b4cdf..b3f2418 100644 --- a/include/linux/squashfs3_fs_sb.h +++ b/include/linux/squashfs3_fs_sb.h @@ -66,7 +66,7 @@ struct squashfs3_sb_info { struct mutex read_data_mutex; struct mutex read_page_mutex; struct mutex meta_index_mutex; - struct meta_index *meta_index; + struct squashfs3_meta_index *meta_index; z_stream stream; long long *inode_lookup_table; int (*read_inode)(struct inode *i, squashfs3_inode_t \ -- 1.6.4.4