From a2bb34144733cba83af0ebd940df23802af2f237 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Axel=20D=C3=B6rfler?= Date: Tue, 1 Sep 2009 13:23:05 +0000 Subject: [PATCH] * Cleanup, no functional change. + alphabranch git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@32890 a95241bf-73f2-0310-859d-f6bbb57e9c96 --- .../kernel/disk_device_manager/KPartition.cpp | 437 +++++++++--------- src/system/kernel/fs/vfs.cpp | 13 +- 2 files changed, 220 insertions(+), 230 deletions(-) diff --git a/src/system/kernel/disk_device_manager/KPartition.cpp b/src/system/kernel/disk_device_manager/KPartition.cpp index 4b43a62201..8e1dc6dfe3 100644 --- a/src/system/kernel/disk_device_manager/KPartition.cpp +++ b/src/system/kernel/disk_device_manager/KPartition.cpp @@ -1,23 +1,24 @@ /* * Copyright 2009, Bryce Groff, bgroff@hawaii.edu. - * Copyright 2004-2008, Haiku, Inc. All rights reserved. + * Copyright 2004-2009, Axel Dörfler, axeld@pinc-software.de. * Copyright 2003-2009, Ingo Weinhold, ingo_weinhold@gmx.de. * * Distributed under the terms of the MIT License. */ +#include + #include #include #include #include #include -#include #include #include #include -#include +#include #include #include @@ -25,40 +26,46 @@ #include #include #include -#include #include #include #include +#include #include #include #include "UserDataWriter.h" + using namespace std; + // debugging //#define DBG(x) #define DBG(x) x #define OUT dprintf -// ListenerSet + struct KPartition::ListenerSet : VectorSet {}; -// constructor + +int32 KPartition::sNextID = 0; + + KPartition::KPartition(partition_id id) - : fPartitionData(), - fChildren(), - fDevice(NULL), - fParent(NULL), - fDiskSystem(NULL), - fDiskSystemPriority(-1), - fListeners(NULL), - fChangeFlags(0), - fChangeCounter(0), - fAlgorithmData(0), - fReferenceCount(0), - fObsolete(false), - fPublishedName(NULL) + : + fPartitionData(), + fChildren(), + fDevice(NULL), + fParent(NULL), + fDiskSystem(NULL), + fDiskSystemPriority(-1), + fListeners(NULL), + fChangeFlags(0), + fChangeCounter(0), + fAlgorithmData(0), + fReferenceCount(0), + fObsolete(false), + fPublishedName(NULL) { fPartitionData.id = id >= 0 ? id : _NextID(); fPartitionData.offset = 0; @@ -81,7 +88,7 @@ KPartition::KPartition(partition_id id) fPartitionData.content_cookie = NULL; } -// destructor + KPartition::~KPartition() { delete fListeners; @@ -93,18 +100,18 @@ KPartition::~KPartition() free(fPartitionData.content_parameters); } -// Register + void KPartition::Register() { fReferenceCount++; } -// Unregister + void KPartition::Unregister() { - KDiskDeviceManager *manager = KDiskDeviceManager::Default(); + KDiskDeviceManager* manager = KDiskDeviceManager::Default(); ManagerLocker locker(manager); fReferenceCount--; if (IsObsolete() && fReferenceCount == 0) { @@ -113,28 +120,28 @@ KPartition::Unregister() } } -// CountReferences + int32 KPartition::CountReferences() const { return fReferenceCount; } -// MarkObsolete + void KPartition::MarkObsolete() { fObsolete = true; } -// IsObsolete + bool KPartition::IsObsolete() const { return fObsolete; } -// PrepareForRemoval + bool KPartition::PrepareForRemoval() { @@ -148,16 +155,16 @@ KPartition::PrepareForRemoval() return result; } -// PrepareForDeletion + bool KPartition::PrepareForDeletion() { return true; } -// Open + status_t -KPartition::Open(int flags, int *fd) +KPartition::Open(int flags, int* fd) { if (!fd) return B_BAD_VALUE; @@ -176,7 +183,7 @@ KPartition::Open(int flags, int *fd) return B_OK; } -// PublishDevice + status_t KPartition::PublishDevice() { @@ -217,7 +224,7 @@ KPartition::PublishDevice() return B_OK; } -// UnpublishDevice + status_t KPartition::UnpublishDevice() { @@ -238,7 +245,6 @@ KPartition::UnpublishDevice() } -// RepublishDevice status_t KPartition::RepublishDevice() { @@ -281,7 +287,6 @@ KPartition::RepublishDevice() } -// IsPublished bool KPartition::IsPublished() const { @@ -289,7 +294,6 @@ KPartition::IsPublished() const } -// SetBusy void KPartition::SetBusy(bool busy) { @@ -300,15 +304,13 @@ KPartition::SetBusy(bool busy) } -// IsBusy bool KPartition::IsBusy() const { - return (fPartitionData.flags & B_PARTITION_BUSY); + return (fPartitionData.flags & B_PARTITION_BUSY) != 0; } -// IsBusy bool KPartition::IsBusy(bool includeDescendants) { @@ -326,7 +328,6 @@ KPartition::IsBusy(bool includeDescendants) } -// CheckAndMarkBusy bool KPartition::CheckAndMarkBusy(bool includeDescendants) { @@ -339,7 +340,6 @@ KPartition::CheckAndMarkBusy(bool includeDescendants) } -// MarkBusy void KPartition::MarkBusy(bool includeDescendants) { @@ -358,7 +358,6 @@ KPartition::MarkBusy(bool includeDescendants) } -// UnmarkBusy void KPartition::UnmarkBusy(bool includeDescendants) { @@ -377,7 +376,6 @@ KPartition::UnmarkBusy(bool includeDescendants) } -// SetOffset void KPartition::SetOffset(off_t offset) { @@ -387,14 +385,14 @@ KPartition::SetOffset(off_t offset) } } -// Offset + off_t KPartition::Offset() const { return fPartitionData.offset; } -// SetSize + void KPartition::SetSize(off_t size) { @@ -404,14 +402,14 @@ KPartition::SetSize(off_t size) } } -// Size + off_t KPartition::Size() const { return fPartitionData.size; } -// SetContentSize + void KPartition::SetContentSize(off_t size) { @@ -421,14 +419,14 @@ KPartition::SetContentSize(off_t size) } } -// ContentSize + off_t KPartition::ContentSize() const { return fPartitionData.content_size; } -// SetBlockSize + void KPartition::SetBlockSize(uint32 blockSize) { @@ -438,14 +436,14 @@ KPartition::SetBlockSize(uint32 blockSize) } } -// BlockSize + uint32 KPartition::BlockSize() const { return fPartitionData.block_size; } -// SetIndex + void KPartition::SetIndex(int32 index) { @@ -455,14 +453,14 @@ KPartition::SetIndex(int32 index) } } -// Index + int32 KPartition::Index() const { return fPartitionData.index; } -// SetStatus + void KPartition::SetStatus(uint32 status) { @@ -472,21 +470,21 @@ KPartition::SetStatus(uint32 status) } } -// Status + uint32 KPartition::Status() const { return fPartitionData.status; } -// IsUninitialized + bool KPartition::IsUninitialized() const { - return (Status() == B_PARTITION_UNINITIALIZED); + return Status() == B_PARTITION_UNINITIALIZED; } -// SetFlags + void KPartition::SetFlags(uint32 flags) { @@ -496,7 +494,7 @@ KPartition::SetFlags(uint32 flags) } } -// AddFlags + void KPartition::AddFlags(uint32 flags) { @@ -506,7 +504,7 @@ KPartition::AddFlags(uint32 flags) } } -// ClearFlags + void KPartition::ClearFlags(uint32 flags) { @@ -516,118 +514,118 @@ KPartition::ClearFlags(uint32 flags) } } -// Flags + uint32 KPartition::Flags() const { return fPartitionData.flags; } -// ContainsFileSystem + bool KPartition::ContainsFileSystem() const { - return (fPartitionData.flags & B_PARTITION_FILE_SYSTEM); + return (fPartitionData.flags & B_PARTITION_FILE_SYSTEM) != 0; } -// ContainsPartitioningSystem + bool KPartition::ContainsPartitioningSystem() const { - return (fPartitionData.flags & B_PARTITION_PARTITIONING_SYSTEM); + return (fPartitionData.flags & B_PARTITION_PARTITIONING_SYSTEM) != 0; } -// IsReadOnly + bool KPartition::IsReadOnly() const { - return (fPartitionData.flags & B_PARTITION_READ_ONLY); + return (fPartitionData.flags & B_PARTITION_READ_ONLY) != 0; } -// IsMounted + bool KPartition::IsMounted() const { - return (fPartitionData.flags & B_PARTITION_MOUNTED); + return (fPartitionData.flags & B_PARTITION_MOUNTED) != 0; } -// IsDevice + bool KPartition::IsDevice() const { - return (fPartitionData.flags & B_PARTITION_IS_DEVICE); + return (fPartitionData.flags & B_PARTITION_IS_DEVICE) != 0; } -// SetName + status_t -KPartition::SetName(const char *name) +KPartition::SetName(const char* name) { status_t error = set_string(fPartitionData.name, name); FireNameChanged(fPartitionData.name); return error; } -// Name -const char * + +const char* KPartition::Name() const { return fPartitionData.name; } -// SetContentName + status_t -KPartition::SetContentName(const char *name) +KPartition::SetContentName(const char* name) { status_t error = set_string(fPartitionData.content_name, name); FireContentNameChanged(fPartitionData.content_name); return error; } -// ContentName -const char * + +const char* KPartition::ContentName() const { return fPartitionData.content_name; } -// SetType + status_t -KPartition::SetType(const char *type) +KPartition::SetType(const char* type) { status_t error = set_string(fPartitionData.type, type); FireTypeChanged(fPartitionData.type); return error; } -// Type -const char * + +const char* KPartition::Type() const { return fPartitionData.type; } -// ContentType -const char * + +const char* KPartition::ContentType() const { return fPartitionData.content_type; } -// PartitionData -partition_data * + +partition_data* KPartition::PartitionData() { return &fPartitionData; } -// PartitionData -const partition_data * + +const partition_data* KPartition::PartitionData() const { return &fPartitionData; } -// SetID + void KPartition::SetID(partition_id id) { @@ -637,7 +635,7 @@ KPartition::SetID(partition_id id) } } -// ID + partition_id KPartition::ID() const { @@ -646,7 +644,7 @@ KPartition::ID() const status_t -KPartition::GetFileName(char *buffer, size_t size) const +KPartition::GetFileName(char* buffer, size_t size) const { // If the parent is the device, the name is the index of the partition. if (Parent() == NULL || Parent()->IsDevice()) { @@ -669,7 +667,7 @@ KPartition::GetFileName(char *buffer, size_t size) const status_t -KPartition::GetPath(KPath *path) const +KPartition::GetPath(KPath* path) const { // For a KDiskDevice this version is never invoked, so the check for // Parent() is correct. @@ -691,7 +689,6 @@ KPartition::GetPath(KPath *path) const } -// SetVolumeID void KPartition::SetVolumeID(dev_t volumeID) { @@ -705,16 +702,16 @@ KPartition::SetVolumeID(dev_t volumeID) } } -// VolumeID + dev_t KPartition::VolumeID() const { return fPartitionData.volume; } -// SetMountCookie + void -KPartition::SetMountCookie(void *cookie) +KPartition::SetMountCookie(void* cookie) { if (fPartitionData.mount_cookie != cookie) { fPartitionData.mount_cookie = cookie; @@ -722,22 +719,22 @@ KPartition::SetMountCookie(void *cookie) } } -// MountCookie -void * + +void* KPartition::MountCookie() const { return fPartitionData.mount_cookie; } -// Mount + status_t -KPartition::Mount(uint32 mountFlags, const char *parameters) +KPartition::Mount(uint32 mountFlags, const char* parameters) { // not implemented return B_ERROR; } -// Unmount + status_t KPartition::Unmount() { @@ -745,72 +742,72 @@ KPartition::Unmount() return B_ERROR; } -// SetParameters + status_t -KPartition::SetParameters(const char *parameters) +KPartition::SetParameters(const char* parameters) { status_t error = set_string(fPartitionData.parameters, parameters); FireParametersChanged(fPartitionData.parameters); return error; } -// Parameters -const char * + +const char* KPartition::Parameters() const { return fPartitionData.parameters; } -// SetContentParameters + status_t -KPartition::SetContentParameters(const char *parameters) +KPartition::SetContentParameters(const char* parameters) { status_t error = set_string(fPartitionData.content_parameters, parameters); FireContentParametersChanged(fPartitionData.content_parameters); return error; } -// ContentParameters -const char * + +const char* KPartition::ContentParameters() const { return fPartitionData.content_parameters; } -// SetDevice + void -KPartition::SetDevice(KDiskDevice *device) +KPartition::SetDevice(KDiskDevice* device) { fDevice = device; - if (fDevice && fDevice->IsReadOnlyMedia()) + if (fDevice != NULL && fDevice->IsReadOnlyMedia()) AddFlags(B_PARTITION_READ_ONLY); } -// Device -KDiskDevice * + +KDiskDevice* KPartition::Device() const { return fDevice; } -// SetParent + void -KPartition::SetParent(KPartition *parent) +KPartition::SetParent(KPartition* parent) { // Must be called in a {Add,Remove}Child() only! fParent = parent; } -// Parent -KPartition * + +KPartition* KPartition::Parent() const { return fParent; } -// AddChild + status_t -KPartition::AddChild(KPartition *partition, int32 index) +KPartition::AddChild(KPartition* partition, int32 index) { // check parameters int32 count = fPartitionData.child_count; @@ -818,8 +815,9 @@ KPartition::AddChild(KPartition *partition, int32 index) index = count; if (index < 0 || index > count || !partition) return B_BAD_VALUE; + // add partition - KDiskDeviceManager *manager = KDiskDeviceManager::Default(); + KDiskDeviceManager* manager = KDiskDeviceManager::Default(); if (ManagerLocker locker = manager) { status_t error = fChildren.Insert(partition, index); if (error != B_OK) @@ -847,10 +845,9 @@ KPartition::AddChild(KPartition *partition, int32 index) } -// CreateChild status_t KPartition::CreateChild(partition_id id, int32 index, off_t offset, off_t size, - KPartition **_child) + KPartition** _child) { // check parameters int32 count = fPartitionData.child_count; @@ -860,8 +857,8 @@ KPartition::CreateChild(partition_id id, int32 index, off_t offset, off_t size, return B_BAD_VALUE; // create and add partition - KPartition *child = new(nothrow) KPartition(id); - if (!child) + KPartition* child = new(std::nothrow) KPartition(id); + if (child == NULL) return B_NO_MEMORY; child->SetOffset(offset); @@ -879,15 +876,15 @@ KPartition::CreateChild(partition_id id, int32 index, off_t offset, off_t size, } -// RemoveChild bool KPartition::RemoveChild(int32 index) { if (index < 0 || index >= fPartitionData.child_count) return false; - KDiskDeviceManager *manager = KDiskDeviceManager::Default(); + + KDiskDeviceManager* manager = KDiskDeviceManager::Default(); if (ManagerLocker locker = manager) { - KPartition *partition = fChildren.ElementAt(index); + KPartition* partition = fChildren.ElementAt(index); PartitionRegistrar _(partition); if (!partition || !manager->PartitionRemoved(partition) || !fChildren.Erase(index)) { @@ -905,9 +902,9 @@ KPartition::RemoveChild(int32 index) return false; } -// RemoveChild + bool -KPartition::RemoveChild(KPartition *child) +KPartition::RemoveChild(KPartition* child) { if (child) { int32 index = fChildren.IndexOf(child); @@ -917,7 +914,7 @@ KPartition::RemoveChild(KPartition *child) return false; } -// RemoveAllChildren + bool KPartition::RemoveAllChildren() { @@ -929,41 +926,41 @@ KPartition::RemoveAllChildren() return true; } -// ChildAt -KPartition * + +KPartition* KPartition::ChildAt(int32 index) const { - return (index >= 0 && index < fChildren.Count() - ? fChildren.ElementAt(index) : NULL); + return index >= 0 && index < fChildren.Count() + ? fChildren.ElementAt(index) : NULL; } -// CountChildren + int32 KPartition::CountChildren() const { return fPartitionData.child_count; } -// CountDescendants + int32 KPartition::CountDescendants() const { int32 count = 1; - for (int32 i = 0; KPartition *child = ChildAt(i); i++) + for (int32 i = 0; KPartition* child = ChildAt(i); i++) count += child->CountDescendants(); return count; } -// VisitEachDescendant -KPartition * -KPartition::VisitEachDescendant(KPartitionVisitor *visitor) + +KPartition* +KPartition::VisitEachDescendant(KPartitionVisitor* visitor) { if (!visitor) return NULL; if (visitor->VisitPre(this)) return this; - for (int32 i = 0; KPartition *child = ChildAt(i); i++) { - if (KPartition *result = child->VisitEachDescendant(visitor)) + for (int32 i = 0; KPartition* child = ChildAt(i); i++) { + if (KPartition* result = child->VisitEachDescendant(visitor)) return result; } if (visitor->VisitPost(this)) @@ -972,9 +969,8 @@ KPartition::VisitEachDescendant(KPartitionVisitor *visitor) } -// SetDiskSystem void -KPartition::SetDiskSystem(KDiskSystem *diskSystem, float priority) +KPartition::SetDiskSystem(KDiskSystem* diskSystem, float priority) { // unload former disk system if (fDiskSystem) { @@ -985,8 +981,10 @@ KPartition::SetDiskSystem(KDiskSystem *diskSystem, float priority) } // set and load new one fDiskSystem = diskSystem; - if (fDiskSystem) - fDiskSystem->Load(); // can't fail, since it's already loaded + if (fDiskSystem) { + fDiskSystem->Load(); + // can't fail, since it's already loaded + } // update concerned partition flags if (fDiskSystem) { fPartitionData.content_type = fDiskSystem->PrettyName(); @@ -1000,8 +998,8 @@ KPartition::SetDiskSystem(KDiskSystem *diskSystem, float priority) FireDiskSystemChanged(fDiskSystem); } -// DiskSystem -KDiskSystem * + +KDiskSystem* KPartition::DiskSystem() const { return fDiskSystem; @@ -1015,16 +1013,15 @@ KPartition::DiskSystemPriority() const } -// ParentDiskSystem -KDiskSystem * +KDiskSystem* KPartition::ParentDiskSystem() const { - return (Parent() ? Parent()->DiskSystem() : NULL); + return Parent() ? Parent()->DiskSystem() : NULL; } -// SetCookie + void -KPartition::SetCookie(void *cookie) +KPartition::SetCookie(void* cookie) { if (fPartitionData.cookie != cookie) { fPartitionData.cookie = cookie; @@ -1032,16 +1029,16 @@ KPartition::SetCookie(void *cookie) } } -// Cookie -void * + +void* KPartition::Cookie() const { return fPartitionData.cookie; } -// SetContentCookie + void -KPartition::SetContentCookie(void *cookie) +KPartition::SetContentCookie(void* cookie) { if (fPartitionData.content_cookie != cookie) { fPartitionData.content_cookie = cookie; @@ -1049,16 +1046,16 @@ KPartition::SetContentCookie(void *cookie) } } -// ContentCookie -void * + +void* KPartition::ContentCookie() const { return fPartitionData.content_cookie; } -// AddListener + bool -KPartition::AddListener(KPartitionListener *listener) +KPartition::AddListener(KPartitionListener* listener) { if (!listener) return false; @@ -1069,12 +1066,12 @@ KPartition::AddListener(KPartitionListener *listener) return false; } // add listener - return (fListeners->Insert(listener) == B_OK); + return fListeners->Insert(listener) == B_OK; } -// RemoveListener + bool -KPartition::RemoveListener(KPartitionListener *listener) +KPartition::RemoveListener(KPartitionListener* listener) { if (!listener || !fListeners) return false; @@ -1087,7 +1084,7 @@ KPartition::RemoveListener(KPartitionListener *listener) return result; } -// Changed + void KPartition::Changed(uint32 flags, uint32 clearFlags) { @@ -1098,21 +1095,21 @@ KPartition::Changed(uint32 flags, uint32 clearFlags) Parent()->Changed(B_PARTITION_CHANGED_DESCENDANTS); } -// SetChangeFlags + void KPartition::SetChangeFlags(uint32 flags) { fChangeFlags = flags; } -// ChangeFlags + uint32 KPartition::ChangeFlags() const { return fChangeFlags; } -// ChangeCounter + int32 KPartition::ChangeCounter() const { @@ -1120,7 +1117,6 @@ KPartition::ChangeCounter() const } -// UninitializeContents status_t KPartition::UninitializeContents(bool logChanges) { @@ -1197,31 +1193,30 @@ KPartition::UninitializeContents(bool logChanges) } -// SetAlgorithmData void KPartition::SetAlgorithmData(uint32 data) { fAlgorithmData = data; } -// AlgorithmData + uint32 KPartition::AlgorithmData() const { return fAlgorithmData; } -// WriteUserData + void -KPartition::WriteUserData(UserDataWriter &writer, user_partition_data *data) +KPartition::WriteUserData(UserDataWriter& writer, user_partition_data* data) { // allocate - char *name = writer.PlaceString(Name()); - char *contentName = writer.PlaceString(ContentName()); - char *type = writer.PlaceString(Type()); - char *contentType = writer.PlaceString(ContentType()); - char *parameters = writer.PlaceString(Parameters()); - char *contentParameters = writer.PlaceString(ContentParameters()); + char* name = writer.PlaceString(Name()); + char* contentName = writer.PlaceString(ContentName()); + char* type = writer.PlaceString(Type()); + char* contentType = writer.PlaceString(ContentType()); + char* parameters = writer.PlaceString(Parameters()); + char* contentParameters = writer.PlaceString(ContentParameters()); // fill in data if (data) { data->id = ID(); @@ -1251,8 +1246,8 @@ KPartition::WriteUserData(UserDataWriter &writer, user_partition_data *data) writer.AddRelocationEntry(&data->content_parameters); } // children - for (int32 i = 0; KPartition *child = ChildAt(i); i++) { - user_partition_data *childData + for (int32 i = 0; KPartition* child = ChildAt(i); i++) { + user_partition_data* childData = writer.AllocatePartitionData(child->CountChildren()); if (data) { data->children[i] = childData; @@ -1262,12 +1257,13 @@ KPartition::WriteUserData(UserDataWriter &writer, user_partition_data *data) } } -// Dump + void KPartition::Dump(bool deep, int32 level) { if (level < 0 || level > 255) return; + char prefix[256]; sprintf(prefix, "%*s%*s", (int)level, "", (int)level, ""); KPath path; @@ -1275,7 +1271,8 @@ KPartition::Dump(bool deep, int32 level) if (level > 0) OUT("%spartition %ld: %s\n", prefix, ID(), path.Path()); OUT("%s offset: %lld\n", prefix, Offset()); - OUT("%s size: %lld (%.2f MB)\n", prefix, Size(), Size() / (1024.0*1024)); + OUT("%s size: %lld (%.2f MB)\n", prefix, Size(), + Size() / (1024.0*1024)); OUT("%s content size: %lld\n", prefix, ContentSize()); OUT("%s block size: %lu\n", prefix, BlockSize()); OUT("%s child count: %ld\n", prefix, CountChildren()); @@ -1292,12 +1289,12 @@ KPartition::Dump(bool deep, int32 level) OUT("%s params: %s\n", prefix, Parameters()); OUT("%s content params: %s\n", prefix, ContentParameters()); if (deep) { - for (int32 i = 0; KPartition *child = ChildAt(i); i++) + for (int32 i = 0; KPartition* child = ChildAt(i); i++) child->Dump(true, level + 1); } } -// FireOffsetChanged + void KPartition::FireOffsetChanged(off_t offset) { @@ -1309,7 +1306,7 @@ KPartition::FireOffsetChanged(off_t offset) } } -// FireSizeChanged + void KPartition::FireSizeChanged(off_t size) { @@ -1321,7 +1318,7 @@ KPartition::FireSizeChanged(off_t size) } } -// FireContentSizeChanged + void KPartition::FireContentSizeChanged(off_t size) { @@ -1333,7 +1330,7 @@ KPartition::FireContentSizeChanged(off_t size) } } -// FireBlockSizeChanged + void KPartition::FireBlockSizeChanged(uint32 blockSize) { @@ -1345,7 +1342,7 @@ KPartition::FireBlockSizeChanged(uint32 blockSize) } } -// FireIndexChanged + void KPartition::FireIndexChanged(int32 index) { @@ -1357,7 +1354,7 @@ KPartition::FireIndexChanged(int32 index) } } -// FireStatusChanged + void KPartition::FireStatusChanged(uint32 status) { @@ -1369,7 +1366,7 @@ KPartition::FireStatusChanged(uint32 status) } } -// FireFlagsChanged + void KPartition::FireFlagsChanged(uint32 flags) { @@ -1381,9 +1378,9 @@ KPartition::FireFlagsChanged(uint32 flags) } } -// FireNameChanged + void -KPartition::FireNameChanged(const char *name) +KPartition::FireNameChanged(const char* name) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1393,9 +1390,9 @@ KPartition::FireNameChanged(const char *name) } } -// FireContentNameChanged + void -KPartition::FireContentNameChanged(const char *name) +KPartition::FireContentNameChanged(const char* name) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1405,9 +1402,9 @@ KPartition::FireContentNameChanged(const char *name) } } -// FireTypeChanged + void -KPartition::FireTypeChanged(const char *type) +KPartition::FireTypeChanged(const char* type) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1417,7 +1414,7 @@ KPartition::FireTypeChanged(const char *type) } } -// FireIDChanged + void KPartition::FireIDChanged(partition_id id) { @@ -1429,7 +1426,7 @@ KPartition::FireIDChanged(partition_id id) } } -// FireVolumeIDChanged + void KPartition::FireVolumeIDChanged(dev_t volumeID) { @@ -1441,9 +1438,9 @@ KPartition::FireVolumeIDChanged(dev_t volumeID) } } -// FireMountCookieChanged + void -KPartition::FireMountCookieChanged(void *cookie) +KPartition::FireMountCookieChanged(void* cookie) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1453,9 +1450,9 @@ KPartition::FireMountCookieChanged(void *cookie) } } -// FireParametersChanged + void -KPartition::FireParametersChanged(const char *parameters) +KPartition::FireParametersChanged(const char* parameters) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1465,9 +1462,9 @@ KPartition::FireParametersChanged(const char *parameters) } } -// FireContentParametersChanged + void -KPartition::FireContentParametersChanged(const char *parameters) +KPartition::FireContentParametersChanged(const char* parameters) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1477,9 +1474,9 @@ KPartition::FireContentParametersChanged(const char *parameters) } } -// FireChildAdded + void -KPartition::FireChildAdded(KPartition *child, int32 index) +KPartition::FireChildAdded(KPartition* child, int32 index) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1489,9 +1486,9 @@ KPartition::FireChildAdded(KPartition *child, int32 index) } } -// FireChildRemoved + void -KPartition::FireChildRemoved(KPartition *child, int32 index) +KPartition::FireChildRemoved(KPartition* child, int32 index) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1501,9 +1498,9 @@ KPartition::FireChildRemoved(KPartition *child, int32 index) } } -// FireDiskSystemChanged + void -KPartition::FireDiskSystemChanged(KDiskSystem *diskSystem) +KPartition::FireDiskSystemChanged(KDiskSystem* diskSystem) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1513,9 +1510,9 @@ KPartition::FireDiskSystemChanged(KDiskSystem *diskSystem) } } -// FireCookieChanged + void -KPartition::FireCookieChanged(void *cookie) +KPartition::FireCookieChanged(void* cookie) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1525,9 +1522,9 @@ KPartition::FireCookieChanged(void *cookie) } } -// FireContentCookieChanged + void -KPartition::FireContentCookieChanged(void *cookie) +KPartition::FireContentCookieChanged(void* cookie) { if (fListeners) { for (ListenerSet::Iterator it = fListeners->Begin(); @@ -1537,7 +1534,7 @@ KPartition::FireContentCookieChanged(void *cookie) } } -// _UpdateChildIndices + void KPartition::_UpdateChildIndices(int32 start, int32 end) { @@ -1555,14 +1552,8 @@ KPartition::_UpdateChildIndices(int32 start, int32 end) } -// _NextID int32 KPartition::_NextID() { - return atomic_add(&fNextID, 1); + return atomic_add(&sNextID, 1); } - - -// fNextID -int32 KPartition::fNextID = 0; - diff --git a/src/system/kernel/fs/vfs.cpp b/src/system/kernel/fs/vfs.cpp index d660cc4bae..e78307996b 100644 --- a/src/system/kernel/fs/vfs.cpp +++ b/src/system/kernel/fs/vfs.cpp @@ -6880,7 +6880,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags, KPath normalizedDevice; bool newlyCreatedFileDevice = false; - if (!(flags & B_MOUNT_VIRTUAL_DEVICE) && device) { + if (!(flags & B_MOUNT_VIRTUAL_DEVICE) && device != NULL) { // normalize the device path status = normalizedDevice.SetTo(device, true); if (status != B_OK) @@ -6888,8 +6888,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags, // get a corresponding partition from the DDM partition = ddm->RegisterPartition(normalizedDevice.Path()); - - if (!partition) { + if (partition == NULL) { // Partition not found: This either means, the user supplied // an invalid path, or the path refers to an image file. We try // to let the DDM create a file device for the path. @@ -6929,7 +6928,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags, DeviceWriteLocker writeLocker(diskDevice, true); // this takes over the write lock acquired before - if (partition) { + if (partition != NULL) { // make sure, that the partition is not busy if (partition->IsBusy()) { TRACE(("fs_mount(): Partition is busy.\n")); @@ -6937,7 +6936,7 @@ fs_mount(char* path, const char* device, const char* fsName, uint32 flags, } // if no FS name had been supplied, we get it from the partition - if (!fsName) { + if (fsName == NULL) { KDiskSystem* diskSystem = partition->DiskSystem(); if (!diskSystem) { TRACE(("fs_mount(): No FS name was given, and the DDM didn't " @@ -7191,7 +7190,7 @@ fs_unmount(char* path, dev_t mountID, uint32 flags, bool kernel) KDiskDeviceManager* ddm = KDiskDeviceManager::Default(); KPartition* partition = mount->partition; KDiskDevice* diskDevice = NULL; - if (partition) { + if (partition != NULL) { if (partition->Device() == NULL) { dprintf("fs_unmount(): There is no device!\n"); return B_ERROR; @@ -7205,7 +7204,7 @@ fs_unmount(char* path, dev_t mountID, uint32 flags, bool kernel) DeviceWriteLocker writeLocker(diskDevice, true); // make sure, that the partition is not busy - if (partition) { + if (partition != NULL) { if ((flags & B_UNMOUNT_BUSY_PARTITION) == 0 && partition->IsBusy()) { TRACE(("fs_unmount(): Partition is busy.\n")); return B_BUSY;