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

nfs4: OpenConfirm used wrong filehandle

Browse Source
This commit is contained in:
Pawel Dziepak 2012-07-02 20:09:57 +02:00
parent 62167cc0da
commit 0f4dcd8bb3
2 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/add-ons/kernel/file_systems/nfs4/Inode.h
View File

@ -76,7 +76,8 @@ protected:
OpenFileCookie* cookie = NULL);
status_t _LookUpFilehandle();
status_t _ConfirmOpen(OpenFileCookie* cookie);
status_t _ConfirmOpen(const Filehandle& fh,
OpenFileCookie* cookie);
status_t _ReadDirOnce(DirEntry** dirents, uint32* count,
OpenDirCookie* cookie, bool* eof);

8
src/add-ons/kernel/file_systems/nfs4/InodeRegular.cpp
View File

@ -17,7 +17,7 @@
status_t
Inode::_ConfirmOpen(OpenFileCookie* cookie)
Inode::_ConfirmOpen(const Filehandle& fh, OpenFileCookie* cookie)
{
do {
RPC::Server* serv = fFilesystem->Server();
@ -25,7 +25,7 @@ Inode::_ConfirmOpen(OpenFileCookie* cookie)
RequestBuilder& req = request.Builder();
req.PutFH(fHandle);
req.PutFH(fh);
req.OpenConfirm(cookie->fSequence++, cookie->fStateId,
cookie->fStateSeq);
@ -152,7 +152,7 @@ Inode::Create(const char* name, int mode, int perms, OpenFileCookie* cookie,
fFilesystem->AddOpenFile(cookie);
if (confirm)
return _ConfirmOpen(cookie);
return _ConfirmOpen(fh, cookie);
else
return B_OK;
}
@ -248,7 +248,7 @@ Inode::Open(int mode, OpenFileCookie* cookie)
fFilesystem->AddOpenFile(cookie);
if (confirm)
return _ConfirmOpen(cookie);
return _ConfirmOpen(fHandle, cookie);
else
return B_OK;
}