diff options
author | Felix Blyakher <felixb@sgi.com> | 2009-03-11 13:28:03 -0500 |
---|---|---|
committer | Felix Blyakher <felixb@sgi.com> | 2009-03-11 13:28:03 -0500 |
commit | f3697bc314e912599f422cc5c6e53c7382c0aeb2 (patch) | |
tree | cce3583aad8261a6279292f8372202e58233220d /fs/squashfs/inode.c | |
parent | 7bf446f8b581cef434f5ff05e8a791563bc09b7f (diff) | |
parent | 16b71fdf97599f1b1b7f38418ee9922d9f117396 (diff) |
Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux-2.6
Diffstat (limited to 'fs/squashfs/inode.c')
-rw-r--r-- | fs/squashfs/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c index 7a63398bb85..9101dbde39e 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; |