diff options
| author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-05-20 02:26:43 +0100 |
|---|---|---|
| committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-05-25 18:21:31 +0100 |
| commit | 82de647e1f81fd89afc48608d889dd3b33cb8983 (patch) | |
| tree | 847b7b40ed273eaa755c27bef6b1a20d201273c2 /fs/squashfs/fragment.c | |
| parent | 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 (diff) | |
| download | linux-3.10-82de647e1f81fd89afc48608d889dd3b33cb8983.tar.gz linux-3.10-82de647e1f81fd89afc48608d889dd3b33cb8983.tar.bz2 linux-3.10-82de647e1f81fd89afc48608d889dd3b33cb8983.zip | |
Squashfs: move table allocation into squashfs_read_table()
This eliminates a lot of duplicate code.
Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs/fragment.c')
| -rw-r--r-- | fs/squashfs/fragment.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/squashfs/fragment.c b/fs/squashfs/fragment.c index 7eef571443c..567093db587 100644 --- a/fs/squashfs/fragment.c +++ b/fs/squashfs/fragment.c @@ -74,23 +74,6 @@ __le64 *squashfs_read_fragment_index_table(struct super_block *sb, u64 fragment_table_start, unsigned int fragments) { unsigned int length = SQUASHFS_FRAGMENT_INDEX_BYTES(fragments); - __le64 *fragment_index; - int err; - /* Allocate fragment lookup table indexes */ - fragment_index = kmalloc(length, GFP_KERNEL); - if (fragment_index == NULL) { - ERROR("Failed to allocate fragment index table\n"); - return ERR_PTR(-ENOMEM); - } - - err = squashfs_read_table(sb, fragment_index, fragment_table_start, - length); - if (err < 0) { - ERROR("unable to read fragment index table\n"); - kfree(fragment_index); - return ERR_PTR(err); - } - - return fragment_index; + return squashfs_read_table(sb, fragment_table_start, length); } |