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

nfs4: Remove RequestBuilder::ReadDir() count argument

Browse Source 
The argument is ignored anyway. This fixes CID 991593.
This commit is contained in:
Pawel Dziepak
2013-03-19 02:43:22 +01:00
parent 80f94193c4
commit 83b13040c8
3 changed files with 5 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp
+1 -1
View File
@@ -966,7 +966,7 @@ NFS4Inode::ReadDirOnce(DirEntry** dirents, uint32* count, OpenDirCookie* cookie,
req.GetAttr(dirAttr, sizeof(dirAttr) / sizeof(Attribute)); req.GetAttr(dirAttr, sizeof(dirAttr) / sizeof(Attribute));
Attribute attr[] = { FATTR4_FSID, FATTR4_FILEID }; Attribute attr[] = { FATTR4_FSID, FATTR4_FILEID };
req.ReadDir(*count, *dirCookie, *dirCookieVerf, attr, req.ReadDir(*dirCookie, *dirCookieVerf, attr,
sizeof(attr) / sizeof(Attribute)); sizeof(attr) / sizeof(Attribute));
req.GetAttr(dirAttr, sizeof(dirAttr) / sizeof(Attribute)); req.GetAttr(dirAttr, sizeof(dirAttr) / sizeof(Attribute));
src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp
+2 -4
View File
@@ -516,11 +516,9 @@ RequestBuilder::Read(const uint32* id, uint32 stateSeq, uint64 pos, uint32 len)
status_t status_t
RequestBuilder::ReadDir(uint32 count, uint64 cookie, uint64 cookieVerf, RequestBuilder::ReadDir(uint64 cookie, uint64 cookieVerf, Attribute* attrs,
Attribute* attrs, uint32 attrCount) uint32 attrCount)
{ {
(void)count;
if (fProcedure != ProcCompound) if (fProcedure != ProcCompound)
return B_BAD_VALUE; return B_BAD_VALUE;
if (fRequest == NULL) if (fRequest == NULL)
src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h
+2 -3
View File
@@ -63,9 +63,8 @@ public:
status_t PutRootFH(); status_t PutRootFH();
status_t Read(const uint32* id, uint32 stateSeq, status_t Read(const uint32* id, uint32 stateSeq,
uint64 pos, uint32 len); uint64 pos, uint32 len);
status_t ReadDir(uint32 count, uint64 cookie, status_t ReadDir(uint64 cookie, uint64 cookieVerf,
uint64 cookieVerf, Attribute* attrs, Attribute* attrs, uint32 attrCount);
uint32 attrCount);
status_t ReadLink(); status_t ReadLink();
status_t Remove(const char* file); status_t Remove(const char* file);
status_t Rename(const char* from, const char* to); status_t Rename(const char* from, const char* to);