summaryrefslogtreecommitdiffstats
path: root/fs/squashfs
diff options
context:
space:
mode:
authorRoel Kluin <roel.kluin@gmail.com>2009-03-05 00:55:31 +0000
committerPhillip Lougher <phillip@lougher.demon.co.uk>2009-03-05 00:55:31 +0000
commitf4f8056a862a9950320429dfda708c88b4ce6025 (patch)
tree5dc5874e703b35864d328269f12ef9840fb10bb5 /fs/squashfs
parentedf2e2811efa9304ebe14f778d33b764cfd58b7a (diff)
downloadop-kernel-dev-f4f8056a862a9950320429dfda708c88b4ce6025.zip
op-kernel-dev-f4f8056a862a9950320429dfda708c88b4ce6025.tar.gz
Squashfs: frag_size should be signed, as it can hold an error result
Signed-off-by: Roel Kluin <roel.kluin@gmail.com> Signed-off-by: Phillip Lougher <phillip@lougher.demon.co.uk>
Diffstat (limited to 'fs/squashfs')
-rw-r--r--fs/squashfs/inode.c6
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c
index 7a63398..9101dbd 100644
--- a/fs/squashfs/inode.c
+++ b/fs/squashfs/inode.c
@@ -133,7 +133,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
type = le16_to_cpu(sqshb_ino->inode_type);
switch (type) {
case SQUASHFS_REG_TYPE: {
- unsigned int frag_offset, frag_size, frag;
+ unsigned int frag_offset, frag;
+ int frag_size;
u64 frag_blk;
struct squashfs_reg_inode *sqsh_ino = &squashfs_ino.reg;
@@ -175,7 +176,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
break;
}
case SQUASHFS_LREG_TYPE: {
- unsigned int frag_offset, frag_size, frag;
+ unsigned int frag_offset, frag;
+ int frag_size;
u64 frag_blk;
struct squashfs_lreg_inode *sqsh_ino = &squashfs_ino.lreg;
OpenPOWER on IntegriCloud