diff options
author | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-05-19 21:26:43 -0400 |
---|---|---|
committer | Phillip Lougher <phillip@lougher.demon.co.uk> | 2011-05-25 13:21:31 -0400 |
commit | 82de647e1f81fd89afc48608d889dd3b33cb8983 (patch) | |
tree | 847b7b40ed273eaa755c27bef6b1a20d201273c2 /fs/squashfs/export.c | |
parent | 117a91e0f25fd7698e20ac3dfa62086be3dc82a3 (diff) |
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/export.c')
-rw-r--r-- | fs/squashfs/export.c | 19 |
1 files changed, 1 insertions, 18 deletions
diff --git a/fs/squashfs/export.c b/fs/squashfs/export.c index 7f93d5a9ee0..cc6dd90cee6 100644 --- a/fs/squashfs/export.c +++ b/fs/squashfs/export.c | |||
@@ -124,27 +124,10 @@ __le64 *squashfs_read_inode_lookup_table(struct super_block *sb, | |||
124 | u64 lookup_table_start, unsigned int inodes) | 124 | u64 lookup_table_start, unsigned int inodes) |
125 | { | 125 | { |
126 | unsigned int length = SQUASHFS_LOOKUP_BLOCK_BYTES(inodes); | 126 | unsigned int length = SQUASHFS_LOOKUP_BLOCK_BYTES(inodes); |
127 | __le64 *inode_lookup_table; | ||
128 | int err; | ||
129 | 127 | ||
130 | TRACE("In read_inode_lookup_table, length %d\n", length); | 128 | TRACE("In read_inode_lookup_table, length %d\n", length); |
131 | 129 | ||
132 | /* Allocate inode lookup table indexes */ | 130 | return squashfs_read_table(sb, lookup_table_start, length); |
133 | inode_lookup_table = kmalloc(length, GFP_KERNEL); | ||
134 | if (inode_lookup_table == NULL) { | ||
135 | ERROR("Failed to allocate inode lookup table\n"); | ||
136 | return ERR_PTR(-ENOMEM); | ||
137 | } | ||
138 | |||
139 | err = squashfs_read_table(sb, inode_lookup_table, lookup_table_start, | ||
140 | length); | ||
141 | if (err < 0) { | ||
142 | ERROR("unable to read inode lookup table\n"); | ||
143 | kfree(inode_lookup_table); | ||
144 | return ERR_PTR(err); | ||
145 | } | ||
146 | |||
147 | return inode_lookup_table; | ||
148 | } | 131 | } |
149 | 132 | ||
150 | 133 | ||