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

nfs4: Add support for volatile filehandles

Browse Source
This commit is contained in:
Pawel Dziepak
2012-06-29 02:14:50 +02:00
parent d1e6b61e2e
commit c702f887ad
6 changed files with 443 additions and 316 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/Filehandle.h
+10 -4
View File
@@ -36,8 +36,7 @@ struct FileInfo {
Filehandle fParent; Filehandle fParent;
const char* fName; const char* fName;
const char* fPath;
// ... full path may be needed if filehandles are volatile
inline FileInfo(); inline FileInfo();
inline ~FileInfo(); inline ~FileInfo();
@@ -76,7 +75,8 @@ inline
FileInfo::FileInfo() FileInfo::FileInfo()
: :
fFileId(0), fFileId(0),
fName(NULL) fName(NULL),
fPath(NULL)
{ {
} }
@@ -85,6 +85,7 @@ inline
FileInfo::~FileInfo() FileInfo::~FileInfo()
{ {
free(const_cast<char*>(fName)); free(const_cast<char*>(fName));
free(const_cast<char*>(fPath));
} }
@@ -94,7 +95,8 @@ FileInfo::FileInfo(const FileInfo& fi)
fFileId(fi.fFileId), fFileId(fi.fFileId),
fFH(fi.fFH), fFH(fi.fFH),
fParent(fi.fParent), fParent(fi.fParent),
fName(strdup(fi.fName)) fName(strdup(fi.fName)),
fPath(strdup(fi.fPath))
{ {
} }
@@ -108,6 +110,10 @@ FileInfo::operator=(const FileInfo& fi)
free(const_cast<char*>(fName)); free(const_cast<char*>(fName));
fName = strdup(fi.fName); fName = strdup(fi.fName);
free(const_cast<char*>(fPath));
fPath = strdup(fi.fPath);
return *this; return *this;
} }
src/add-ons/kernel/file_systems/nfs4/Filesystem.cpp
+4 -23
View File
@@ -18,6 +18,7 @@
Filesystem::Filesystem() Filesystem::Filesystem()
: :
fPath(NULL),
fId(1) fId(1)
{ {
} }
@@ -25,6 +26,7 @@ Filesystem::Filesystem()
Filesystem::~Filesystem() Filesystem::~Filesystem()
{ {
free(const_cast<char*>(fPath));
} }
@@ -60,8 +62,6 @@ Filesystem::Mount(Filesystem** pfs, RPC::Server* serv, const char* fsPath,
req.GetFH(); req.GetFH();
req.Access(); req.Access();
Attribute attr[] = { FATTR4_FH_EXPIRE_TYPE };
req.GetAttr(attr, sizeof(attr) / sizeof(Attribute));
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
@@ -92,32 +92,12 @@ Filesystem::Mount(Filesystem** pfs, RPC::Server* serv, const char* fsPath,
!= (ACCESS4_READ | ACCESS4_LOOKUP)) != (ACCESS4_READ | ACCESS4_LOOKUP))
return B_PERMISSION_DENIED; return B_PERMISSION_DENIED;
AttrValue* values;
uint32 count;
result = reply.GetAttr(&values, &count);
if (result != B_OK)
return result;
if (count != 1 || values[0].fAttribute != FATTR4_FH_EXPIRE_TYPE) {
delete[] values;
return B_BAD_VALUE;
}
// Currently, only persistent filehandles are supported. That will be
// changed soon.
if (values[0].fData.fValue32 != FH4_PERSISTENT) {
delete[] values;
return B_UNSUPPORTED;
}
Filesystem* fs = new(std::nothrow) Filesystem; Filesystem* fs = new(std::nothrow) Filesystem;
fs->fFHExpiryType = values[0].fData.fValue32; fs->fPath = strdup(fsPath);
memcpy(&fs->fRootFH, &fh, sizeof(Filehandle)); memcpy(&fs->fRootFH, &fh, sizeof(Filehandle));
fs->fServer = serv; fs->fServer = serv;
fs->fDevId = id; fs->fDevId = id;
delete[] values;
*pfs = fs; *pfs = fs;
return B_OK; return B_OK;
@@ -152,6 +132,7 @@ Filesystem::CreateRootInode()
fi.fFH = fRootFH; fi.fFH = fRootFH;
fi.fParent = fRootFH; fi.fParent = fRootFH;
fi.fName = strdup("/"); fi.fName = strdup("/");
fi.fPath = strdup(fPath);
Inode* inode; Inode* inode;
status_t result = Inode::CreateInode(this, fi, &inode); status_t result = Inode::CreateInode(this, fi, &inode);
src/add-ons/kernel/file_systems/nfs4/Filesystem.h
+1 -3
View File
@@ -26,8 +26,6 @@ public:
status_t GetInode(ino_t id, Inode** inode); status_t GetInode(ino_t id, Inode** inode);
Inode* CreateRootInode(); Inode* CreateRootInode();
inline uint32 FHExpiryType() const;
inline RPC::Server* Server(); inline RPC::Server* Server();
inline NFS4Server* NFSServer(); inline NFS4Server* NFSServer();
@@ -38,7 +36,7 @@ public:
private: private:
Filesystem(); Filesystem();
uint32 fFHExpiryType; const char* fPath;
Filehandle fRootFH; Filehandle fRootFH;
src/add-ons/kernel/file_systems/nfs4/Inode.cpp
+422 -276
View File
@@ -20,8 +20,6 @@ Inode::Inode()
} }
// Creating Inode object from Filehandle probably is not a good idea when
// filehandles are volatile.
status_t status_t
Inode::CreateInode(Filesystem* fs, const FileInfo &fi, Inode** _inode) Inode::CreateInode(Filesystem* fs, const FileInfo &fi, Inode** _inode)
{ {
@@ -33,47 +31,56 @@ Inode::CreateInode(Filesystem* fs, const FileInfo &fi, Inode** _inode)
inode->fFilesystem = fs; inode->fFilesystem = fs;
inode->fParentFH = fi.fParent; inode->fParentFH = fi.fParent;
inode->fName = strdup(fi.fName); inode->fName = strdup(fi.fName);
inode->fPath = strdup(fi.fPath);
Request request(fs->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fs->Server());
RequestBuilder& req = request.Builder();
req.PutFH(inode->fHandle); req.PutFH(inode->fHandle);
Attribute attr[] = { FATTR4_TYPE, FATTR4_FILEID }; Attribute attr[] = { FATTR4_TYPE, FATTR4_FILEID };
req.GetAttr(attr, sizeof(attr) / sizeof(Attribute)); req.GetAttr(attr, sizeof(attr) / sizeof(Attribute));
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; inode->_LookUpFilehandle();
continue;
}
AttrValue* values; result = reply.PutFH();
uint32 count; if (result != B_OK)
result = reply.GetAttr(&values, &count); return result;
if (result != B_OK || count < 1)
return result;
if (fi.fFileId == 0) { AttrValue* values;
if (count < 2 || values[1].fAttribute != FATTR4_FILEID) uint32 count;
inode->fFileId = fs->AllocFileId(); result = reply.GetAttr(&values, &count);
else if (result != B_OK || count < 1)
inode->fFileId = values[1].fData.fValue64; return result;
} else
inode->fFileId = fi.fFileId;
// FATTR4_TYPE is mandatory if (fi.fFileId == 0) {
inode->fType = values[0].fData.fValue32; if (count < 2 || values[1].fAttribute != FATTR4_FILEID)
inode->fFileId = fs->AllocFileId();
else
inode->fFileId = values[1].fData.fValue64;
} else
inode->fFileId = fi.fFileId;
delete[] values; // FATTR4_TYPE is mandatory
inode->fType = values[0].fData.fValue32;
*_inode = inode; delete[] values;
return B_OK; *_inode = inode;
return B_OK;
} while (true);
} }
@@ -94,60 +101,82 @@ Inode::LookUp(const char* name, ino_t* id)
return B_OK; return B_OK;
} }
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
if (!strcmp(name, "..")) if (!strcmp(name, ".."))
req.LookUpUp(); req.LookUpUp();
else else
req.LookUp(name); req.LookUp(name);
req.GetFH(); req.GetFH();
Attribute attr[] = { FATTR4_FILEID }; Attribute attr[] = { FATTR4_FILEID };
req.GetAttr(attr, sizeof(attr) / sizeof(Attribute)); req.GetAttr(attr, sizeof(attr) / sizeof(Attribute));
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; _LookUpFilehandle();
continue;
}
if (!strcmp(name, "..")) result = reply.PutFH();
result = reply.LookUpUp(); if (result != B_OK)
else return result;
result = reply.LookUp();
if (result != B_OK)
return result;
Filehandle fh; if (!strcmp(name, ".."))
result = reply.GetFH(&fh); result = reply.LookUpUp();
if (result != B_OK) else
return result; result = reply.LookUp();
if (result != B_OK)
return result;
AttrValue* values; Filehandle fh;
uint32 count; result = reply.GetFH(&fh);
result = reply.GetAttr(&values, &count); if (result != B_OK)
if (result != B_OK) return result;
return result;
uint64 fileId; AttrValue* values;
if (count < 1 || values[0].fAttribute != FATTR4_FILEID) uint32 count;
fileId = fFilesystem->AllocFileId(); result = reply.GetAttr(&values, &count);
else if (result != B_OK)
fileId = values[0].fData.fValue64; return result;
delete[] values;
*id = _FileIdToInoT(fileId); uint64 fileId;
fFilesystem->InoIdMap()->AddEntry(fh, fHandle, name, fileId, *id); if (count < 1 || values[0].fAttribute != FATTR4_FILEID)
fileId = fFilesystem->AllocFileId();
else
fileId = values[0].fData.fValue64;
delete[] values;
return B_OK; *id = _FileIdToInoT(fileId);
FileInfo fi;
fi.fFileId = fileId;
fi.fFH = fh;
fi.fParent = fHandle;
fi.fName = strdup(name);
char* path = reinterpret_cast<char*>(malloc(strlen(name) + 2 +
strlen(fPath)));
strcpy(path, fPath);
strcat(path, "/");
strcat(path, name);
fi.fPath = path;
fFilesystem->InoIdMap()->AddEntry(fi, *id);
return B_OK;
} while (true);
} }
@@ -157,179 +186,204 @@ Inode::ReadLink(void* buffer, size_t* length)
if (fType != NF4LNK) if (fType != NF4LNK)
return B_BAD_VALUE; return B_BAD_VALUE;
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
req.ReadLink(); req.ReadLink();
status_t result = request.Send();
if (result != B_OK)
return result;
ReplyInterpreter& reply = request.Reply();
// filehandle has expired
if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
_LookUpFilehandle();
continue;
}
result = reply.PutFH();
if (result != B_OK)
return result;
uint32 size;
result = reply.ReadLink(buffer, &size, *length);
*length = static_cast<size_t>(size);
status_t result = request.Send();
if (result != B_OK)
return result; return result;
} while (true);
ReplyInterpreter& reply = request.Reply();
result = reply.PutFH();
if (result != B_OK)
return result;
uint32 size;
result = reply.ReadLink(buffer, &size, *length);
*length = static_cast<size_t>(size);
return result;
} }
status_t status_t
Inode::Access(int mode) Inode::Access(int mode)
{ {
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
req.Access(); req.Access();
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; _LookUpFilehandle();
continue;
}
uint32 allowed; result = reply.PutFH();
result = reply.Access(NULL, &allowed); if (result != B_OK)
if (result != B_OK) return result;
return result;
int acc = 0; uint32 allowed;
if ((allowed & ACCESS4_READ) != 0) result = reply.Access(NULL, &allowed);
acc |= R_OK; if (result != B_OK)
return result;
if (fType == NF4DIR && (allowed & ACCESS4_LOOKUP) != 0) int acc = 0;
acc |= X_OK | R_OK; if ((allowed & ACCESS4_READ) != 0)
acc |= R_OK;
if (fType != NF4DIR && (allowed & ACCESS4_EXECUTE) != 0) if (fType == NF4DIR && (allowed & ACCESS4_LOOKUP) != 0)
acc |= X_OK; acc |= X_OK | R_OK;
if ((allowed & ACCESS4_MODIFY) != 0) if (fType != NF4DIR && (allowed & ACCESS4_EXECUTE) != 0)
acc |= W_OK; acc |= X_OK;
if ((mode & acc) != mode) if ((allowed & ACCESS4_MODIFY) != 0)
return B_NOT_ALLOWED; acc |= W_OK;
return B_OK; if ((mode & acc) != mode)
return B_NOT_ALLOWED;
return B_OK;
} while (true);
} }
status_t status_t
Inode::Stat(struct stat* st) Inode::Stat(struct stat* st)
{ {
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
Attribute attr[] = { FATTR4_SIZE, FATTR4_MODE, FATTR4_NUMLINKS, Attribute attr[] = { FATTR4_SIZE, FATTR4_MODE, FATTR4_NUMLINKS,
FATTR4_TIME_ACCESS, FATTR4_TIME_CREATE, FATTR4_TIME_ACCESS, FATTR4_TIME_CREATE,
FATTR4_TIME_METADATA, FATTR4_TIME_MODIFY }; FATTR4_TIME_METADATA, FATTR4_TIME_MODIFY };
req.GetAttr(attr, sizeof(attr) / sizeof(Attribute)); req.GetAttr(attr, sizeof(attr) / sizeof(Attribute));
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; _LookUpFilehandle();
continue;
}
AttrValue* values; result = reply.PutFH();
uint32 count; if (result != B_OK)
result = reply.GetAttr(&values, &count); return result;
if (result != B_OK)
return result; AttrValue* values;
uint32 count;
result = reply.GetAttr(&values, &count);
if (result != B_OK)
return result;
// FATTR4_SIZE is mandatory
if (count < 1 || values[0].fAttribute != FATTR4_SIZE) {
delete[] values;
return B_BAD_VALUE;
}
st->st_size = values[0].fData.fValue64;
uint32 next = 1;
st->st_mode = Type();
if (count >= next && values[next].fAttribute == FATTR4_MODE) {
st->st_mode |= values[next].fData.fValue32;
next++;
} else {
// Try to guess using ACCESS request
request.Reset();
request.Builder().PutFH(fHandle);
request.Builder().Access();
result = request.Send();
if (result != B_OK)
return result;
result = request.Reply().PutFH();
if (result != B_OK)
return result;
uint32 prvl;
result = request.Reply().Access(NULL, &prvl);
if (result != B_OK)
return result;
if ((prvl & ACCESS4_READ) != 0)
st->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
if ((prvl & ACCESS4_MODIFY) != 0)
st->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
if (fType == NF4DIR && (prvl & ACCESS4_LOOKUP) != 0)
st->st_mode |= S_IXUSR | S_IXGRP | S_IXOTH;
if (fType != NF4DIR && (prvl & ACCESS4_EXECUTE) != 0)
st->st_mode |= S_IXUSR | S_IXGRP | S_IXOTH;
}
if (count >= next && values[next].fAttribute == FATTR4_NUMLINKS) {
st->st_nlink = values[next].fData.fValue32;
next++;
} else
st->st_nlink = 1;
if (count >= next && values[next].fAttribute == FATTR4_TIME_ACCESS) {
memcpy(&st->st_atim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_atim, 0, sizeof(timespec));
if (count >= next && values[next].fAttribute == FATTR4_TIME_CREATE) {
memcpy(&st->st_crtim, values[next].fData.fPointer,
sizeof(timespec));
next++;
} else
memset(&st->st_crtim, 0, sizeof(timespec));
if (count >= next && values[next].fAttribute == FATTR4_TIME_METADATA) {
memcpy(&st->st_ctim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_ctim, 0, sizeof(timespec));
if (count >= next && values[next].fAttribute == FATTR4_TIME_MODIFY) {
memcpy(&st->st_mtim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_mtim, 0, sizeof(timespec));
st->st_uid = 0;
st->st_gid = 0;
// FATTR4_SIZE is mandatory
if (count < 1 || values[0].fAttribute != FATTR4_SIZE) {
delete[] values; delete[] values;
return B_BAD_VALUE; return B_OK;
} } while (true);
st->st_size = values[0].fData.fValue64;
uint32 next = 1;
st->st_mode = Type();
if (count >= next && values[next].fAttribute == FATTR4_MODE) {
st->st_mode |= values[next].fData.fValue32;
next++;
} else {
// Try to guess using ACCESS request
request.Reset();
request.Builder().PutFH(fHandle);
request.Builder().Access();
result = request.Send();
if (result != B_OK)
return result;
result = request.Reply().PutFH();
if (result != B_OK)
return result;
uint32 prvl;
result = request.Reply().Access(NULL, &prvl);
if (result != B_OK)
return result;
if ((prvl & ACCESS4_READ) != 0)
st->st_mode |= S_IRUSR | S_IRGRP | S_IROTH;
if ((prvl & ACCESS4_MODIFY) != 0)
st->st_mode |= S_IWUSR | S_IWGRP | S_IWOTH;
if (fType == NF4DIR && (prvl & ACCESS4_LOOKUP) != 0)
st->st_mode |= S_IXUSR | S_IXGRP | S_IXOTH;
if (fType != NF4DIR && (prvl & ACCESS4_EXECUTE) != 0)
st->st_mode |= S_IXUSR | S_IXGRP | S_IXOTH;
}
if (count >= next && values[next].fAttribute == FATTR4_NUMLINKS) {
st->st_nlink = values[next].fData.fValue32;
next++;
} else
st->st_nlink = 1;
if (count >= next && values[next].fAttribute == FATTR4_TIME_ACCESS) {
memcpy(&st->st_atim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_atim, 0, sizeof(timespec));
if (count >= next && values[next].fAttribute == FATTR4_TIME_CREATE) {
memcpy(&st->st_crtim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_crtim, 0, sizeof(timespec));
if (count >= next && values[next].fAttribute == FATTR4_TIME_METADATA) {
memcpy(&st->st_ctim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_ctim, 0, sizeof(timespec));
if (count >= next && values[next].fAttribute == FATTR4_TIME_MODIFY) {
memcpy(&st->st_mtim, values[next].fData.fPointer, sizeof(timespec));
next++;
} else
memset(&st->st_mtim, 0, sizeof(timespec));
st->st_uid = 0;
st->st_gid = 0;
delete[] values;
return B_OK;
} }
@@ -362,6 +416,12 @@ Inode::Open(int mode, OpenFileCookie* cookie)
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
// filehandle has expired
if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
_LookUpFilehandle();
continue;
}
// server is in grace period, we need to wait // server is in grace period, we need to wait
if (reply.NFS4Error() == NFS4ERR_GRACE) { if (reply.NFS4Error() == NFS4ERR_GRACE) {
fFilesystem->NFSServer()->ReleaseCID(cookie->fClientId); fFilesystem->NFSServer()->ReleaseCID(cookie->fClientId);
@@ -437,6 +497,12 @@ Inode::Close(OpenFileCookie* cookie)
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
// filehandle has expired
if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
_LookUpFilehandle();
continue;
}
// server is in grace period, we need to wait // server is in grace period, we need to wait
if (reply.NFS4Error() == NFS4ERR_GRACE) { if (reply.NFS4Error() == NFS4ERR_GRACE) {
snooze_etc(fFilesystem->NFSServer()->LeaseTime() / 3, snooze_etc(fFilesystem->NFSServer()->LeaseTime() / 3,
@@ -483,6 +549,12 @@ Inode::Read(OpenFileCookie* cookie, off_t pos, void* buffer, size_t* _length)
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
// filehandle has expired
if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
_LookUpFilehandle();
continue;
}
// server is in grace period, we need to wait // server is in grace period, we need to wait
if (reply.NFS4Error() == NFS4ERR_GRACE) { if (reply.NFS4Error() == NFS4ERR_GRACE) {
snooze_etc(fFilesystem->NFSServer()->LeaseTime() / 3, snooze_etc(fFilesystem->NFSServer()->LeaseTime() / 3,
@@ -524,34 +596,42 @@ Inode::OpenDir(uint64* cookie)
if (fType != NF4DIR) if (fType != NF4DIR)
return B_NOT_A_DIRECTORY; return B_NOT_A_DIRECTORY;
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
req.Access(); req.Access();
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; _LookUpFilehandle();
continue;
}
uint32 allowed; result = reply.PutFH();
result = reply.Access(NULL, &allowed); if (result != B_OK)
if (result != B_OK) return result;
return result;
if (allowed & ACCESS4_READ != ACCESS4_READ) uint32 allowed;
return B_PERMISSION_DENIED; result = reply.Access(NULL, &allowed);
if (result != B_OK)
return result;
cookie[0] = 0; if (allowed & ACCESS4_READ != ACCESS4_READ)
cookie[1] = 2; return B_PERMISSION_DENIED;
return B_OK; cookie[0] = 0;
cookie[1] = 2;
return B_OK;
} while (true);
} }
@@ -559,25 +639,33 @@ status_t
Inode::_ReadDirOnce(DirEntry** dirents, uint32* count, uint64* cookie, Inode::_ReadDirOnce(DirEntry** dirents, uint32* count, uint64* cookie,
bool* eof) bool* eof)
{ {
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
Attribute attr[] = { FATTR4_FILEID }; Attribute attr[] = { FATTR4_FILEID };
req.ReadDir(*count, cookie, attr, sizeof(attr) / sizeof(Attribute)); req.ReadDir(*count, cookie, attr, sizeof(attr) / sizeof(Attribute));
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; _LookUpFilehandle();
continue;
}
return reply.ReadDir(cookie, dirents, count, eof); result = reply.PutFH();
if (result != B_OK)
return result;
return reply.ReadDir(cookie, dirents, count, eof);
} while (true);
} }
@@ -606,47 +694,55 @@ Inode::_FillDirEntry(struct dirent* de, ino_t id, const char* name, uint32 pos,
status_t status_t
Inode::_ReadDirUp(struct dirent* de, uint32 pos, uint32 size) Inode::_ReadDirUp(struct dirent* de, uint32 pos, uint32 size)
{ {
Request request(fFilesystem->Server()); do {
RequestBuilder& req = request.Builder(); Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutFH(fHandle); req.PutFH(fHandle);
req.LookUpUp(); req.LookUpUp();
req.GetFH(); req.GetFH();
Attribute attr[] = { FATTR4_FILEID }; Attribute attr[] = { FATTR4_FILEID };
req.GetAttr(attr, sizeof(attr) / sizeof(Attribute)); req.GetAttr(attr, sizeof(attr) / sizeof(Attribute));
status_t result = request.Send(); status_t result = request.Send();
if (result != B_OK) if (result != B_OK)
return result; return result;
ReplyInterpreter& reply = request.Reply(); ReplyInterpreter& reply = request.Reply();
result = reply.PutFH(); // filehandle has expired
if (result != B_OK) if (reply.NFS4Error() == NFS4ERR_FHEXPIRED) {
return result; _LookUpFilehandle();
continue;
}
result = reply.LookUpUp(); result = reply.PutFH();
if (result != B_OK) if (result != B_OK)
return result; return result;
Filehandle fh; result = reply.LookUpUp();
result = reply.GetFH(&fh); if (result != B_OK)
if (result != B_OK) return result;
return result;
AttrValue* values; Filehandle fh;
uint32 count; result = reply.GetFH(&fh);
result = reply.GetAttr(&values, &count); if (result != B_OK)
if (result != B_OK) return result;
return result;
uint64 fileId; AttrValue* values;
if (count < 1 || values[0].fAttribute != FATTR4_FILEID) { uint32 count;
fileId = fFilesystem->AllocFileId(); result = reply.GetAttr(&values, &count);
} else if (result != B_OK)
fileId = values[0].fData.fValue64; return result;
return _FillDirEntry(de, _FileIdToInoT(fileId), "..", pos, size); uint64 fileId;
if (count < 1 || values[0].fAttribute != FATTR4_FILEID) {
fileId = fFilesystem->AllocFileId();
} else
fileId = values[0].fData.fValue64;
return _FillDirEntry(de, _FileIdToInoT(fileId), "..", pos, size);
} while (true);
} }
// TODO: Currently inode numbers returned by ReadDir are virtually random. // TODO: Currently inode numbers returned by ReadDir are virtually random.
@@ -726,3 +822,53 @@ Inode::ReadDir(void* _buffer, uint32 size, uint32* _count, uint64* cookie)
return B_OK; return B_OK;
} }
status_t
Inode::_LookUpFilehandle()
{
Request request(fFilesystem->Server());
RequestBuilder& req = request.Builder();
req.PutRootFH();
uint32 lookupCount = 0;
char* path = strdup(fPath);
char* pathStart = path;
char* pathEnd;
while (pathStart != NULL) {
pathEnd = strpbrk(pathStart, "/");
if (pathEnd != NULL)
*pathEnd = '\0';
req.LookUp(pathStart);
if (pathEnd != NULL && pathEnd[1] != '\0')
pathStart = pathEnd + 1;
else
pathStart = NULL;
lookupCount++;
}
free(path);
req.GetFH();
status_t result = request.Send();
if (result != B_OK)
return result;
ReplyInterpreter& reply = request.Reply();
result = reply.PutRootFH();
if (result != B_OK)
return result;
for (uint32 i = 0; i < lookupCount; i++) {
result = reply.LookUp();
if (result != B_OK)
return result;
}
return reply.GetFH(&fHandle);
}
src/add-ons/kernel/file_systems/nfs4/Inode.h
+4
View File
@@ -61,6 +61,8 @@ public:
private: private:
Inode(); Inode();
status_t _LookUpFilehandle();
status_t _ReadDirOnce(DirEntry** dirents, uint32* count, status_t _ReadDirOnce(DirEntry** dirents, uint32* count,
uint64* cookie, bool* eof); uint64* cookie, bool* eof);
status_t _FillDirEntry(struct dirent* de, ino_t id, status_t _FillDirEntry(struct dirent* de, ino_t id,
@@ -78,6 +80,8 @@ private:
Filehandle fParentFH; Filehandle fParentFH;
const char* fName; const char* fName;
const char* fPath;
}; };
src/add-ons/kernel/file_systems/nfs4/InodeIdMap.h
+2 -10
View File
@@ -17,9 +17,7 @@
class InodeIdMap { class InodeIdMap {
public: public:
inline status_t AddEntry(const Filehandle& fh, inline status_t AddEntry(const FileInfo& fi,
const Filehandle& parent,
const char* name, uint64 fileId,
ino_t id); ino_t id);
inline status_t GetFileInfo(FileInfo* fi, ino_t id); inline status_t GetFileInfo(FileInfo* fi, ino_t id);
@@ -30,14 +28,8 @@ private:
inline status_t inline status_t
InodeIdMap::AddEntry(const Filehandle& fh, const Filehandle& parent, InodeIdMap::AddEntry(const FileInfo& fi, ino_t id)
const char* name, uint64 fileId, ino_t id)
{ {
FileInfo fi;
fi.fFileId = fileId;
fi.fFH = fh;
fi.fParent = parent;
fi.fName = strdup(name);
return fMap.Insert(id, fi); return fMap.Insert(id, fi);
} }