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/Runtime/r3/fs.cpp | |
| 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/Runtime/r3/fs.cpp')
| -rw-r--r-- | src/VBox/Runtime/r3/fs.cpp | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/src/VBox/Runtime/r3/fs.cpp b/src/VBox/Runtime/r3/fs.cpp index 74a9d64f1..b22b6fe99 100644 --- a/src/VBox/Runtime/r3/fs.cpp +++ b/src/VBox/Runtime/r3/fs.cpp @@ -35,6 +35,7 @@ #ifndef RT_OS_WINDOWS # define RTTIME_INCL_TIMESPEC # include <sys/time.h> +# include <sys/param.h> #endif #include <iprt/fs.h> @@ -195,7 +196,7 @@ bool rtFsModeIsValidPermissions(RTFMODE fMode) void rtFsConvertStatToObjInfo(PRTFSOBJINFO pObjInfo, const struct stat *pStat, const char *pszName, unsigned cbName) { pObjInfo->cbObject = pStat->st_size; - pObjInfo->cbAllocated = pStat->st_size; + pObjInfo->cbAllocated = pStat->st_blocks * DEV_BSIZE; #ifdef HAVE_STAT_NSEC RTTimeSpecAddNano(RTTimeSpecSetSeconds(&pObjInfo->AccessTime, pStat->st_atime), pStat->st_atimensec); |