[haiku-commits] r40227 - haiku/trunk/src/add-ons/kernel/file_systems/packagefs
- From: zooey@xxxxxxxxxxxxxxx
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 12 Jan 2011 23:01:03 +0100 (CET)
Author: zooey
Date: 2011-01-12 23:01:03 +0100 (Wed, 12 Jan 2011)
New Revision: 40227
Changeset: http://dev.haiku-os.org/changeset/40227
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
haiku/trunk/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
Log:
* Volume::Mount(): fix KDL in case the volume-name was missing from
the mount parameters
* packagefs_read_stat(): put some sane value into st_blocks
Modified: haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
2011-01-12 21:03:09 UTC (rev 40226)
+++ haiku/trunk/src/add-ons/kernel/file_systems/packagefs/Volume.cpp
2011-01-12 22:01:03 UTC (rev 40227)
@@ -344,7 +344,7 @@
RETURN_ERROR(error);
const char* packages = NULL;
- const char* volumeName = "Package FS";
+ const char* volumeName = NULL;
void* parameterHandle = parse_driver_settings_string(parameterString);
if (parameterHandle != NULL) {
packages
@@ -362,7 +362,7 @@
fRootDirectory = new(std::nothrow) Directory(kRootDirectoryID);
if (fRootDirectory == NULL)
RETURN_ERROR(B_NO_MEMORY);
- fRootDirectory->Init(NULL, volumeName);
+ fRootDirectory->Init(NULL, volumeName != NULL ? volumeName : "Package
FS");
fNodes.Insert(fRootDirectory);
// create default package domain
Modified:
haiku/trunk/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
===================================================================
--- haiku/trunk/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
2011-01-12 21:03:09 UTC (rev 40226)
+++ haiku/trunk/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp
2011-01-12 22:01:03 UTC (rev 40227)
@@ -341,6 +341,7 @@
st->st_ctim = st->st_mtim;
// TODO: Perhaps manage a changed time (particularly for
directories)?
st->st_crtim = st->st_mtim;
+ st->st_blocks = st->st_size / 512;
return B_OK;
}
Other related posts:
