Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* The inode may actually not be known when calling _RemoveInvalidNode(), this

Browse Source 
could cause a KDL.
* Added a "force" argument to Inode::Remove() which should make it remove inodes
  more reliably for checkfs.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@31773 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2009-07-26 14:01:27 +00:00
parent d29e4565b7
commit e66295e5e5
3 changed files with 10 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/add-ons/kernel/file_systems/bfs/BlockAllocator.cpp
View File

@ -1428,7 +1428,7 @@ BlockAllocator::CheckNextNode(check_control* control)
control->errors |= BFS_COULD_NOT_OPEN;
if ((control->flags & BFS_REMOVE_INVALID) != 0)
status = _RemoveInvalidNode(cookie->parent, inode, name);
status = _RemoveInvalidNode(cookie->parent, NULL, name);
else
status = B_ERROR;
@ -1500,9 +1500,10 @@ BlockAllocator::_RemoveInvalidNode(Inode* parent, Inode* inode,
// the bitmap anyway
Transaction transaction(fVolume, parent->BlockNumber());
inode->Node().flags |= HOST_ENDIAN_TO_BFS_INT32(INODE_DONT_FREE_SPACE);
status_t status
= parent->Remove(transaction, name, NULL, inode->IsContainer());
if (inode != NULL)
inode->Node().flags |= HOST_ENDIAN_TO_BFS_INT32(INODE_DONT_FREE_SPACE);
status_t status = parent->Remove(transaction, name, NULL, false, true);
if (status == B_OK)
transaction.Done();

6
src/add-ons/kernel/file_systems/bfs/Inode.cpp
View File

@ -2333,7 +2333,7 @@ Inode::Sync()
status_t
Inode::Remove(Transaction& transaction, const char* name, ino_t* _id,
bool isDirectory)
bool isDirectory, bool force)
{
BPlusTree* tree;
if (GetTree(&tree) != B_OK)
@ -2364,7 +2364,7 @@ Inode::Remove(Transaction& transaction, const char* name, ino_t* _id,
// bit is set for indices in BFS, not for attribute directories) - but you
// should really be able to do whatever you want with your indices
// without having to remove all files first :)
if (!inode->IsIndex()) {
if (!inode->IsIndex() && !force) {
// if it's not of the correct type, don't delete it!
if (inode->IsContainer() != isDirectory)
return isDirectory ? B_NOT_A_DIRECTORY : B_IS_A_DIRECTORY;
@ -2379,7 +2379,7 @@ Inode::Remove(Transaction& transaction, const char* name, ino_t* _id,
if (status != B_OK)
return status;
if (tree->Remove(transaction, name, id) < B_OK) {
if (tree->Remove(transaction, name, id) != B_OK && !force) {
unremove_vnode(fVolume->FSVolume(), id);
RETURN_ERROR(B_ERROR);
}

3
src/add-ons/kernel/file_systems/bfs/Inode.h
View File

@ -142,7 +142,8 @@ public:
// create/remove inodes
status_t Remove(Transaction& transaction, const char* name,
ino_t* _id = NULL, bool isDirectory = false);
ino_t* _id = NULL, bool isDirectory = false,
bool force = false);
static status_t Create(Transaction& transaction, Inode* parent,
const char* name, int32 mode, int openMode,
uint32 type, bool* _created = NULL,