diff options
| author | plougher <plougher> | 2008-10-05 02:58:11 +0000 |
|---|---|---|
| committer | plougher <plougher> | 2008-10-05 02:58:11 +0000 |
| commit | 8bcfe8047e396d7b76e89ad09f4f1b87e2010944 (patch) | |
| tree | 4892a7021bd51fed8a8864467e509535ab23ee36 /kernel | |
| parent | f3cc5012dafece07b0bb42d66e577c3179f403eb (diff) | |
| download | squashfs-tools-8bcfe8047e396d7b76e89ad09f4f1b87e2010944.tar.gz | |
Remove obsolete parameters in read_blocklist (they were necessary for
the read_blocklist implementation for 1.0 filesystems).
Diffstat (limited to 'kernel')
| -rw-r--r-- | kernel/fs/squashfs/file.c | 10 | ||||
| -rw-r--r-- | kernel/fs/squashfs/squashfs.h | 3 |
2 files changed, 4 insertions, 9 deletions
diff --git a/kernel/fs/squashfs/file.c b/kernel/fs/squashfs/file.c index 8d26a7f..a07917c 100644 --- a/kernel/fs/squashfs/file.c +++ b/kernel/fs/squashfs/file.c @@ -193,10 +193,8 @@ static int get_meta_index(struct inode *inode, int index, } else { if (meta->entries == 0) goto failed; - /* XXX */ offset = index < meta->offset + meta->entries ? index : meta->offset + meta->entries - 1; - /* XXX */ meta_entry = &meta->meta_entry[offset - meta->offset]; cur_index_block = meta_entry->index_block + msblk->inode_table_start; @@ -255,9 +253,8 @@ failed: } -long long read_blocklist(struct inode *inode, int index, - int readahead_blks, void *block_list, - unsigned short **block_p, unsigned int *bsize) +long long read_blocklist(struct inode *inode, int index, void *block_list, + unsigned int *bsize) { long long block_ptr; int offset; @@ -331,8 +328,7 @@ static int squashfs_readpage(struct file *file, struct page *page) goto error_out; } - block = read_blocklist(inode, index, 1, block_list, NULL, - &bsize); + block = read_blocklist(inode, index, block_list, &bsize); if (block == 0) goto error_out; diff --git a/kernel/fs/squashfs/squashfs.h b/kernel/fs/squashfs/squashfs.h index 9c55139..5834d8f 100644 --- a/kernel/fs/squashfs/squashfs.h +++ b/kernel/fs/squashfs/squashfs.h @@ -62,8 +62,7 @@ extern __le64 *read_inode_lookup_table(struct super_block *, long long, unsigned int); /* file.c */ -extern long long read_blocklist(struct inode *, int, int, void *, - unsigned short **, unsigned int *); +extern long long read_blocklist(struct inode *, int, void *, unsigned int *); /* fragment.c */ extern int get_fragment_location(struct super_block *, unsigned int, |