Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless

[~andy/linux] / fs / squashfs / inode.c

diff --git a/fs/squashfs/inode.c b/fs/squashfs/inode.c
index fd7b3b3bda136fa720c75421b3551815417affd7..81afbccfa8432ba49a644a16c2c0a0526da31ea5 100644 (file)
--- a/fs/squashfs/inode.c
+++ b/fs/squashfs/inode.c
@@ -208,8 +208,8 @@ int squashfs_read_inode(struct inode *inode, long long ino)
                inode->i_op = &squashfs_inode_ops;
                inode->i_fop = &generic_ro_fops;
                inode->i_mode |= S_IFREG;
-               inode->i_blocks = ((inode->i_size -
-                               le64_to_cpu(sqsh_ino->sparse) - 1) >> 9) + 1;
+               inode->i_blocks = (inode->i_size -
+                               le64_to_cpu(sqsh_ino->sparse) + 511) >> 9;
 
                squashfs_i(inode)->fragment_block = frag_blk;
                squashfs_i(inode)->fragment_size = frag_size;