From c12d05e82d710f4de610e7b319d75df465876a42 Mon Sep 17 00:00:00 2001 From: Phillip Lougher Date: Tue, 3 Jan 2012 02:58:13 +0000 Subject: [PATCH] --- yaml --- r: 284472 b: refs/heads/master c: 3d4a1c80c4eb97187b3a61b3bfa8c804327f7a45 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/squashfs/inode.c | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/[refs] b/[refs] index a6839585c1f5..6fa96194a75d 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: cc37f75a9ffbbfcb1c3297534f293c8284e3c5a6 +refs/heads/master: 3d4a1c80c4eb97187b3a61b3bfa8c804327f7a45 diff --git a/trunk/fs/squashfs/inode.c b/trunk/fs/squashfs/inode.c index fd7b3b3bda13..81afbccfa843 100644 --- a/trunk/fs/squashfs/inode.c +++ b/trunk/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;