From 80ddd8dafcf2cde74a15bab4e6cf90a8708146f3 Mon Sep 17 00:00:00 2001 From: Oliver Tappe Date: Wed, 12 Jan 2011 22:01:03 +0000 Subject: [PATCH] * 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 git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@40227 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- src/add-ons/kernel/file_systems/packagefs/Volume.cpp | 4 ++-- .../kernel/file_systems/packagefs/kernel_interface.cpp | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp index 198f63b050..cf54c2c7db 100644 --- a/src/add-ons/kernel/file_systems/packagefs/Volume.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/Volume.cpp @@ -344,7 +344,7 @@ Volume::Mount(const char* parameterString) 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 @@ Volume::Mount(const char* parameterString) 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 diff --git a/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp b/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp index 08685f4906..b2bc3e0ef7 100644 --- a/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/packagefs/kernel_interface.cpp @@ -341,6 +341,7 @@ packagefs_read_stat(fs_volume* fsVolume, fs_vnode* fsNode, struct stat* st) 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; }