diff options
| author | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 20:55:11 +0400 |
|---|---|---|
| committer | Anton Vorontsov <cbouatmailru@gmail.com> | 2012-01-10 20:55:11 +0400 |
| commit | 913272b3864d6da89c70d9fc2c30ccb57794b369 (patch) | |
| tree | 4fb0a8ab1b53623d2a8ea200b80a3ace2d271471 /fs/btrfs/inode.c | |
| parent | 6cfc2a23540667cff6da6e41d1f1167a9a45aa9a (diff) | |
| parent | 629bcb4b72d49b3631ae3dd0fe1d345820fadfcc (diff) | |
Merge git://git.infradead.org/users/cbou/battery-urgent
Diffstat (limited to 'fs/btrfs/inode.c')
| -rw-r--r-- | fs/btrfs/inode.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/fs/btrfs/inode.c b/fs/btrfs/inode.c index 116ab67a06df..526dd51a1966 100644 --- a/fs/btrfs/inode.c +++ b/fs/btrfs/inode.c @@ -6794,11 +6794,13 @@ static int btrfs_getattr(struct vfsmount *mnt, struct dentry *dentry, struct kstat *stat) { struct inode *inode = dentry->d_inode; + u32 blocksize = inode->i_sb->s_blocksize; + generic_fillattr(inode, stat); stat->dev = BTRFS_I(inode)->root->anon_dev; stat->blksize = PAGE_CACHE_SIZE; - stat->blocks = (inode_get_bytes(inode) + - BTRFS_I(inode)->delalloc_bytes) >> 9; + stat->blocks = (ALIGN(inode_get_bytes(inode), blocksize) + + ALIGN(BTRFS_I(inode)->delalloc_bytes, blocksize)) >> 9; return 0; } |