diff options
| author | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
|---|---|---|
| committer | Michael Meskes <meskes@debian.org> | 2009-11-19 17:48:11 +0100 |
| commit | fd892711c6bdc0ef96b6b3ea13b668cb2a38196e (patch) | |
| tree | e6ec126da2bcd6a490d5661118630edf983580ec /src/VBox/Additions/linux/sharedfolders/utils.c | |
| parent | 8dc3a7e38d0783262b1aa8c3462e7359d8996d98 (diff) | |
| parent | b35715c68a1bec309bc1990353e35c20a21d5c47 (diff) | |
| download | virtualbox-debian/3.0.10-dfsg-2bpo50+1.tar.gz | |
Merge branch 'master' into lennydebian/3.0.10-dfsg-2bpo50+1
Conflicts:
debian/changelog
Diffstat (limited to 'src/VBox/Additions/linux/sharedfolders/utils.c')
| -rw-r--r-- | src/VBox/Additions/linux/sharedfolders/utils.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/VBox/Additions/linux/sharedfolders/utils.c b/src/VBox/Additions/linux/sharedfolders/utils.c index d1cea1476..df87bb69b 100644 --- a/src/VBox/Additions/linux/sharedfolders/utils.c +++ b/src/VBox/Additions/linux/sharedfolders/utils.c @@ -151,7 +151,8 @@ sf_init_inode (struct sf_glob_info *sf_g, struct inode *inode, #if LINUX_VERSION_CODE >= KERNEL_VERSION (2, 4, 11) inode->i_blkbits = 12; #endif - inode->i_blocks = (info->cbObject + 4095) / 4096; + /* i_blocks always in units of 512 bytes! */ + inode->i_blocks = (info->cbAllocated + 511) / 512; sf_ftime_from_timespec (&inode->i_atime, &info->AccessTime); sf_ftime_from_timespec (&inode->i_ctime, &info->ChangeTime); |