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

Now uses Inode::GetName() where appropriate.

Browse Source 
Fixed a bigger race condition when matching against the name index.


git-svn-id: file:///srv/svn/repos/haiku/trunk/current@2085 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Axel Dörfler
2002-11-25 18:42:40 +00:00
parent 97d569f0de
commit c0f2928e7d
1 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/bfs/Query.cpp
+10 -2
View File
@@ -800,10 +800,16 @@ Equation::Match(Inode *inode, const char *attributeName, int32 type, const uint8
} }
buffer = const_cast<uint8 *>(key); buffer = const_cast<uint8 *>(key);
} else if (!strcmp(fAttribute, "name")) { } else if (!strcmp(fAttribute, "name")) {
// we need to lock before accessing Inode::Name()
inode->SmallDataLock().Lock();
locked = true;
// if not, check for "fake" attributes, "name", "size", "last_modified", // if not, check for "fake" attributes, "name", "size", "last_modified",
buffer = (uint8 *)inode->Name(); buffer = (uint8 *)inode->Name();
if (buffer == NULL) if (buffer == NULL) {
inode->SmallDataLock().Unlock();
return B_ERROR; return B_ERROR;
}
type = B_STRING_TYPE; type = B_STRING_TYPE;
size = strlen((const char *)buffer); size = strlen((const char *)buffer);
@@ -1059,7 +1065,9 @@ Equation::GetNextMatching(Volume *volume, TreeIterator *iterator,
dirent->d_ino = offset; dirent->d_ino = offset;
dirent->d_pdev = volume->ID(); dirent->d_pdev = volume->ID();
dirent->d_pino = volume->ToVnode(inode->Parent()); dirent->d_pino = volume->ToVnode(inode->Parent());
strcpy(dirent->d_name,inode->Name());
if (inode->GetName(dirent->d_name) < B_OK)
FATAL(("inode %Ld in query has no name!\n", inode->BlockNumber()));
#ifdef KEEP_WRONG_DIRENT_RECLEN #ifdef KEEP_WRONG_DIRENT_RECLEN
// ToDo: The available file systems in BeOS apparently don't set the // ToDo: The available file systems in BeOS apparently don't set the