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

nfs4: Update FileInfo at rename

Browse Source
This commit is contained in:
Pawel Dziepak
2012-08-17 03:22:26 +02:00
parent 7c6cdb8360
commit dee0fd8348
9 changed files with 71 additions and 79 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/DirectoryCache.cpp
+3 -19
View File
@@ -267,27 +267,11 @@ DirectoryCache::NotifyChanges(DirectoryCacheSnapshot* oldSnapshot,
FileInfo fi;
fi.fFileId = newCurrent->fNode;
fi.fParent = fInode->fInfo.fHandle;
fi.fName = strdup(newCurrent->fName);
if (fi.fName == NULL)
status_t result = fi.CreateName(fInode->fInfo.fPath,
newCurrent->fName);
if (result != B_OK)
break;
if (fInode->fInfo.fPath != NULL) {
size_t pathLength = strlen(newCurrent->fName) + 2 +
strlen(fInode->fInfo.fPath);
char* path = reinterpret_cast<char*>(pathLength);
if (path == NULL)
break;
strcpy(path, fInode->fInfo.fPath);
strcat(path, "/");
strcat(path, newCurrent->fName);
fi.fPath = path;
} else {
fi.fPath = strdup(newCurrent->fName);
if (fi.fPath == NULL)
break;
}
fInode->GetFileSystem()->InoIdMap()->AddEntry(fi,
Inode::FileIdToInoT(newCurrent->fNode), true);
} while (false);
src/add-ons/kernel/file_systems/nfs4/FileInfo.cpp
+33 -1
View File
@@ -46,6 +46,38 @@ FileInfo::ParsePath(RequestBuilder& req, uint32& count, const char* _path)
}
status_t
FileInfo::CreateName(const char* dirPath, const char* name)
{
free(const_cast<char*>(fName));
fName = strdup(name);
if (fName == NULL)
return B_NO_MEMORY;
if (dirPath != NULL) {
char* path = reinterpret_cast<char*>(malloc(strlen(name) + 2 +
strlen(dirPath)));
if (path == NULL)
return B_NO_MEMORY;
strcpy(path, dirPath);
strcat(path, "/");
strcat(path, name);
free(const_cast<char*>(fPath));
fPath = path;
} else {
free(const_cast<char*>(fPath));
fPath = strdup(name);
}
if (fPath == NULL)
return B_NO_MEMORY;
return B_OK;
}
status_t
FileInfo::UpdateFileHandles(FileSystem* fs)
{
@@ -56,7 +88,7 @@ FileInfo::UpdateFileHandles(FileSystem* fs)
uint32 lookupCount = 0;
status_t result;
dprintf("%s %s\n", fs->Path(), fPath);
result = ParsePath(req, lookupCount, fs->Path());
if (result != B_OK)
return result;
src/add-ons/kernel/file_systems/nfs4/FileInfo.h
+2
View File
@@ -57,6 +57,8 @@ struct FileInfo {
static status_t ParsePath(RequestBuilder& req, uint32& count,
const char* _path);
status_t CreateName(const char* dirPath, const char* name);
};
struct FileSystemId {
src/add-ons/kernel/file_systems/nfs4/Inode.cpp
+12 -42
View File
@@ -226,26 +226,9 @@ Inode::Link(Inode* dir, const char* name)
FileInfo fi = fInfo;
fi.fParent = dir->fInfo.fHandle;
free(const_cast<char*>(fi.fName));
fi.fName = strdup(name);
if (fi.fName == NULL)
return B_NO_MEMORY;
if (fInfo.fPath != NULL) {
char* path = reinterpret_cast<char*>(malloc(strlen(name) + 2 +
strlen(fInfo.fPath)));
if (path == NULL)
return B_NO_MEMORY;
strcpy(path, fInfo.fPath);
strcat(path, "/");
strcat(path, name);
fi.fPath = path;
} else {
fi.fPath = strdup(name);
if (fi.fPath == NULL)
return B_NO_MEMORY;
}
result = fi.CreateName(fInfo.fPath, name);
if (result != B_OK)
return result;
fFileSystem->InoIdMap()->AddEntry(fi, fInfo.fFileId);
@@ -315,7 +298,7 @@ Inode::Remove(const char* name, FileType type, ino_t* id)
status_t
Inode::Rename(Inode* from, Inode* to, const char* fromName, const char* toName,
bool attribute)
bool attribute, ino_t* id)
{
if (from->fFileSystem != to->fFileSystem)
return B_DONT_DO_THAT;
@@ -342,8 +325,8 @@ Inode::Rename(Inode* from, Inode* to, const char* fromName, const char* toName,
ChangeInfo fromChange, toChange;
uint64 fileID;
status_t result = NFS4Inode::Rename(from, to, fromName, toName, &fromChange,
&toChange, &fileID, attribute);
status_t result = NFS4Inode::RenameNode(from, to, fromName, toName,
&fromChange, &toChange, &fileID, attribute);
if (result != B_OK)
return result;
@@ -360,6 +343,9 @@ Inode::Rename(Inode* from, Inode* to, const char* fromName, const char* toName,
cache->Unlock();
}
if (id != NULL)
*id = FileIdToInoT(fileID);
cache = attribute ? to->fAttrCache : to->fCache;
if (cache->Lock() == B_OK) {
if (toChange.fAtomic
@@ -828,25 +814,9 @@ Inode::ChildAdded(const char* name, uint64 fileID,
fi.fFileId = fileID;
fi.fHandle = fileHandle;
fi.fParent = fInfo.fHandle;
fi.fName = strdup(name);
if (fi.fName == NULL)
return B_NO_MEMORY;
if (fInfo.fPath != NULL) {
char* path = reinterpret_cast<char*>(malloc(strlen(name) + 2 +
strlen(fInfo.fPath)));
if (path == NULL)
return B_NO_MEMORY;
strcpy(path, fInfo.fPath);
strcat(path, "/");
strcat(path, name);
fi.fPath = path;
} else {
fi.fPath = strdup(name);
if (fi.fPath == NULL)
return B_NO_MEMORY;
}
status_t result = fi.CreateName(fInfo.fPath, name);
if (result != B_OK)
return result;
return fFileSystem->InoIdMap()->AddEntry(fi, FileIdToInoT(fileID));
}
src/add-ons/kernel/file_systems/nfs4/Inode.h
+2 -2
View File
@@ -58,10 +58,10 @@ public:
status_t Link(Inode* dir, const char* name);
status_t Remove(const char* name, FileType type,
ino_t* id);
ino_t* id = NULL);
static status_t Rename(Inode* from, Inode* to,
const char* fromName, const char* toName,
bool attribute = false);
bool attribute = false, ino_t* id = NULL);
status_t Stat(struct stat* st,
OpenAttrCookie* attr = NULL);
src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp
+1 -11
View File
@@ -38,17 +38,7 @@ Inode::CreateState(const char* name, int mode, int perms, OpenState* state,
fi.fFileId = fileID;
fi.fHandle = handle;
fi.fParent = fInfo.fHandle;
fi.fName = strdup(name);
if (fInfo.fPath != NULL) {
char* path = reinterpret_cast<char*>(malloc(strlen(name) + 2 +
strlen(fInfo.fPath)));
strcpy(path, fInfo.fPath);
strcat(path, "/");
strcat(path, name);
fi.fPath = path;
} else
fi.fPath = strdup(name);
fi.CreateName(fInfo.fPath, name);
fFileSystem->InoIdMap()->AddEntry(fi, FileIdToInoT(fileID));
src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp
+1 -1
View File
@@ -329,7 +329,7 @@ NFS4Inode::WriteStat(OpenState* state, AttrValue* attrs, uint32 attrCount)
status_t
NFS4Inode::Rename(Inode* from, Inode* to, const char* fromName,
NFS4Inode::RenameNode(Inode* from, Inode* to, const char* fromName,
const char* toName, ChangeInfo* fromChange, ChangeInfo* toChange,
uint64* fileID, bool attribute)
{
src/add-ons/kernel/file_systems/nfs4/NFS4Inode.h
+1 -1
View File
@@ -36,7 +36,7 @@ protected:
status_t Link(Inode* dir, const char* name,
ChangeInfo* changeInfo);
static status_t Rename(Inode* from, Inode* to, const char* fromName,
static status_t RenameNode(Inode* from, Inode* to, const char* fromName,
const char* toName, ChangeInfo* fromChange,
ChangeInfo* toChange, uint64* fileID,
bool attribute = false);
src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp
+15 -1
View File
@@ -429,7 +429,21 @@ nfs4_rename(fs_volume* volume, fs_vnode* fromDir, const char* fromName,
{
Inode* fromInode = reinterpret_cast<Inode*>(fromDir->private_node);
Inode* toInode = reinterpret_cast<Inode*>(toDir->private_node);
return Inode::Rename(fromInode, toInode, fromName, toName);
ino_t id;
status_t result = Inode::Rename(fromInode, toInode, fromName, toName, false,
&id);
if (result != B_OK)
return result;
Inode* child;
result = get_vnode(volume, id, reinterpret_cast<void**>(&child));
if (result == B_OK) {
child->fInfo.fParent = toInode->fInfo.fHandle;
child->fInfo.CreateName(toInode->fInfo.fPath, toName);
}
return B_OK;
}