i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

lock.h and cache.h are now C++ friendly.

Browse Source 
If renaming failed late, the old name of the inode was restored, but the
name index was not.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@7835 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2004-06-08 06:09:27 +00:00
parent 5b168fe639
commit fcf3d20e94
1 changed files with 18 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/kernel_interface_r5.cpp
+18 -9
View File
@@ -1,6 +1,6 @@
/* kernel_interface - file system interface to BeOS' vnode layer /* kernel_interface - file system interface to BeOS' vnode layer
** **
** Initial version by Axel Dörfler, [email protected] ** Copyright 2001-2004, Axel Dörfler, [email protected]
** This file may be used under the terms of the OpenBeOS License. ** This file may be used under the terms of the OpenBeOS License.
*/ */
@@ -25,11 +25,9 @@
#endif #endif
#include <fsproto.h> #include <fsproto.h>
#include <cache.h>
#include <lock.h>
extern "C" {
#include <lock.h>
#include <cache.h>
}
#include <fs_index.h> #include <fs_index.h>
#include <fs_query.h> #include <fs_query.h>
@@ -1134,7 +1132,7 @@ bfs_rename(void *_ns, void *_oldDir, const char *oldName, void *_newDir, const c
// If anything fails now, we have to remove the inode from the // If anything fails now, we have to remove the inode from the
// new directory in any case to restore the previous state // new directory in any case to restore the previous state
status_t bailStatus = B_OK; status_t bailStatus = B_OK;
// update the name only when they differ // update the name only when they differ
bool nameUpdated = false; bool nameUpdated = false;
if (strcmp(oldName, newName)) { if (strcmp(oldName, newName)) {
@@ -1145,12 +1143,12 @@ bfs_rename(void *_ns, void *_oldDir, const char *oldName, void *_newDir, const c
nameUpdated = true; nameUpdated = true;
} }
} }
if (status == B_OK) { if (status == B_OK) {
status = tree->Remove(&transaction, (const uint8 *)oldName, strlen(oldName), id); status = tree->Remove(&transaction, (const uint8 *)oldName, strlen(oldName), id);
if (status == B_OK) { if (status == B_OK) {
inode->Node()->parent = newDirectory->BlockRun(); inode->Node()->parent = newDirectory->BlockRun();
// if it's a directory, update the parent directory pointer // if it's a directory, update the parent directory pointer
// in its tree if necessary // in its tree if necessary
BPlusTree *movedTree = NULL; BPlusTree *movedTree = NULL;
@@ -1169,6 +1167,8 @@ bfs_rename(void *_ns, void *_oldDir, const char *oldName, void *_newDir, const c
return B_OK; return B_OK;
} }
} }
// If we get here, something has gone wrong already!
// Those better don't fail, or we switch to a read-only // Those better don't fail, or we switch to a read-only
// device for safety reasons (Volume::Panic() does this // device for safety reasons (Volume::Panic() does this
// for us) // for us)
@@ -1179,8 +1179,17 @@ bfs_rename(void *_ns, void *_oldDir, const char *oldName, void *_newDir, const c
movedTree->Replace(&transaction, (const uint8 *)"..", 2, oldDirectory->ID()); movedTree->Replace(&transaction, (const uint8 *)"..", 2, oldDirectory->ID());
} }
} }
if (bailStatus == B_OK && nameUpdated)
if (bailStatus == B_OK && nameUpdated) {
bailStatus = inode->SetName(&transaction, oldName); bailStatus = inode->SetName(&transaction, oldName);
if (status == B_OK) {
// update inode and index
inode->WriteBack(&transaction);
Index index(volume);
index.UpdateName(&transaction, newName, oldName, inode);
}
}
if (bailStatus == B_OK) if (bailStatus == B_OK)
bailStatus = newTree->Remove(&transaction, (const uint8 *)newName, strlen(newName), id); bailStatus = newTree->Remove(&transaction, (const uint8 *)newName, strlen(newName), id);