diff options
| author | plougher <plougher> | 2008-10-22 02:44:30 +0000 |
|---|---|---|
| committer | Mohamad Ayyash <mkayyash@google.com> | 2015-02-23 12:34:08 -0800 |
| commit | 52c40f19307632c4f1365b6fd39574b8d47ed94c (patch) | |
| tree | f5863fa83e43afb2c9fc9684b37401f1423d606b /kernel | |
| parent | a7ded5ec2c79a727ca74c274e189d0fb041faf61 (diff) | |
| download | squashfs-tools-52c40f19307632c4f1365b6fd39574b8d47ed94c.tar.gz | |
Change super_block s to sb.
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fs/squashfs/id.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/kernel/fs/squashfs/id.c b/kernel/fs/squashfs/id.c index f9510cd..cf366f7 100644 --- a/kernel/fs/squashfs/id.c +++ b/kernel/fs/squashfs/id.c @@ -41,16 +41,17 @@ #include "squashfs.h" -int squashfs_get_id(struct super_block *s, unsigned int index, unsigned int *id) +int squashfs_get_id(struct super_block *sb, unsigned int index, + unsigned int *id) { - struct squashfs_sb_info *msblk = s->s_fs_info; + struct squashfs_sb_info *msblk = sb->s_fs_info; int block = SQUASHFS_ID_BLOCK(index); int offset = SQUASHFS_ID_BLOCK_OFFSET(index); long long start_block = le64_to_cpu(msblk->id_table[block]); __le32 disk_id; int err; - err = squashfs_read_metadata(s, &disk_id, &start_block, &offset, + err = squashfs_read_metadata(sb, &disk_id, &start_block, &offset, sizeof(disk_id)); if (err < 0) return err; @@ -60,8 +61,8 @@ int squashfs_get_id(struct super_block *s, unsigned int index, unsigned int *id) } -__le64 *read_id_index_table(struct super_block *s, long long id_table_start, - unsigned short no_ids) +__le64 *read_id_index_table(struct super_block *sb, long long id_table_start, + unsigned short no_ids) { unsigned int length = SQUASHFS_ID_BLOCK_BYTES(no_ids); __le64 *id_table; @@ -76,7 +77,7 @@ __le64 *read_id_index_table(struct super_block *s, long long id_table_start, return ERR_PTR(-ENOMEM); } - err = squashfs_read_data(s, id_table, id_table_start, length | + err = squashfs_read_data(sb, id_table, id_table_start, length | SQUASHFS_COMPRESSED_BIT_BLOCK, NULL, length); if (err < 0) { ERROR("unable to read id index table\n"); |