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

It's no longer possible to remove or recreate a file that is opened with

Browse Source 
uncached access.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@1928 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler 2002-11-14 00:21:04 +00:00
parent b334e2f00f
commit 601f33e246
1 changed files with 22 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1599,7 +1599,7 @@ Inode::Sync()
status_t
Inode::Remove(Transaction *transaction,const char *name,off_t *_id,bool isDirectory)
Inode::Remove(Transaction *transaction, const char *name, off_t *_id, bool isDirectory)
{
BPlusTree *tree;
if (GetTree(&tree) != B_OK)
@ -1607,13 +1607,13 @@ Inode::Remove(Transaction *transaction,const char *name,off_t *_id,bool isDirect
// does the file even exists?
off_t id;
if (tree->Find((uint8 *)name,(uint16)strlen(name),&id) < B_OK)
if (tree->Find((uint8 *)name, (uint16)strlen(name), &id) < B_OK)
return B_ENTRY_NOT_FOUND;
if (_id)
*_id = id;
Vnode vnode(fVolume,id);
Vnode vnode(fVolume, id);
Inode *inode;
status_t status = vnode.Get(&inode);
if (status < B_OK) {
@ -1621,6 +1621,12 @@ Inode::Remove(Transaction *transaction,const char *name,off_t *_id,bool isDirect
return B_ENTRY_NOT_FOUND;
}
// You can't unlink a mounted or the VM file while it is being used - while
// this is not really necessary, it copies the behaviour of the original BFS
// and let you and me feel a little bit safer
if (inode->Flags() & INODE_NO_CACHE)
return B_NOT_ALLOWED;
// It's a bit stupid, but indices are regarded as directories
// in BFS - so a test for a directory always succeeds, but you
// should really be able to do whatever you want with your indices
@ -1636,11 +1642,11 @@ Inode::Remove(Transaction *transaction,const char *name,off_t *_id,bool isDirect
}
// remove_vnode() allows the inode to be accessed until the last put_vnode()
if (remove_vnode(fVolume->ID(),id) != B_OK)
if (remove_vnode(fVolume->ID(), id) != B_OK)
return B_ERROR;
if (tree->Remove(transaction,(uint8 *)name,(uint16)strlen(name),id) < B_OK) {
unremove_vnode(fVolume->ID(),id);
if (tree->Remove(transaction,(uint8 *)name, (uint16)strlen(name), id) < B_OK) {
unremove_vnode(fVolume->ID(), id);
RETURN_ERROR(B_ERROR);
}
@ -1652,15 +1658,15 @@ Inode::Remove(Transaction *transaction,const char *name,off_t *_id,bool isDirect
Index index(fVolume);
if ((inode->Mode() & (S_ATTR_DIR | S_ATTR | S_INDEX_DIR)) == 0) {
index.RemoveName(transaction,name,inode);
index.RemoveName(transaction, name, inode);
// If removing from the index fails, it is not regarded as a
// fatal error and will not be reported back!
// Deleted inodes won't be visible in queries anyway.
}
if ((inode->Mode() & (S_FILE | S_SYMLINK)) != 0) {
index.RemoveSize(transaction,inode);
index.RemoveLastModified(transaction,inode);
index.RemoveSize(transaction, inode);
index.RemoveLastModified(transaction, inode);
}
if (inode->WriteBack(transaction) < B_OK)
@ -1682,7 +1688,8 @@ Inode::Remove(Transaction *transaction,const char *name,off_t *_id,bool isDirect
*/
status_t
Inode::Create(Transaction *transaction,Inode *parent, const char *name, int32 mode, int omode, uint32 type, off_t *_id, Inode **_inode)
Inode::Create(Transaction *transaction, Inode *parent, const char *name, int32 mode,
int omode, uint32 type, off_t *_id, Inode **_inode)
{
block_run parentRun = parent ? parent->BlockRun() : block_run::Run(0,0,0);
Volume *volume = transaction->GetVolume();
@ -1712,6 +1719,11 @@ Inode::Create(Transaction *transaction,Inode *parent, const char *name, int32 mo
if (inode->IsDirectory())
return B_IS_A_DIRECTORY;
// if it is a mounted device or the VM file, we don't allow to delete it
// while it is open and in use
if (inode->Flags() & INODE_NO_CACHE)
return B_NOT_ALLOWED;
// if omode & O_TRUNC, truncate the existing file
if (omode & O_TRUNC) {
WriteLocked locked(inode->Lock());