From 83b13040c8004685d4d1128bd83baa5f4ac012ff Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Tue, 19 Mar 2013 02:43:22 +0100 Subject: [PATCH] nfs4: Remove RequestBuilder::ReadDir() count argument The argument is ignored anyway. This fixes CID 991593. --- src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp | 2 +- src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp | 6 ++---- src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h | 5 ++--- 3 files changed, 5 insertions(+), 8 deletions(-) diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp b/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp index 97f9a10b51..2e0aee45ac 100644 --- a/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Inode.cpp @@ -966,7 +966,7 @@ NFS4Inode::ReadDirOnce(DirEntry** dirents, uint32* count, OpenDirCookie* cookie, req.GetAttr(dirAttr, sizeof(dirAttr) / sizeof(Attribute)); Attribute attr[] = { FATTR4_FSID, FATTR4_FILEID }; - req.ReadDir(*count, *dirCookie, *dirCookieVerf, attr, + req.ReadDir(*dirCookie, *dirCookieVerf, attr, sizeof(attr) / sizeof(Attribute)); req.GetAttr(dirAttr, sizeof(dirAttr) / sizeof(Attribute)); diff --git a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp index 83ff3b4cf8..f900b846ae 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.cpp @@ -516,11 +516,9 @@ RequestBuilder::Read(const uint32* id, uint32 stateSeq, uint64 pos, uint32 len) status_t -RequestBuilder::ReadDir(uint32 count, uint64 cookie, uint64 cookieVerf, - Attribute* attrs, uint32 attrCount) +RequestBuilder::ReadDir(uint64 cookie, uint64 cookieVerf, Attribute* attrs, + uint32 attrCount) { - (void)count; - if (fProcedure != ProcCompound) return B_BAD_VALUE; if (fRequest == NULL) diff --git a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h index 6bf75248f9..00b0d07f75 100644 --- a/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h +++ b/src/add-ons/kernel/file_systems/nfs4/RequestBuilder.h @@ -63,9 +63,8 @@ public: status_t PutRootFH(); status_t Read(const uint32* id, uint32 stateSeq, uint64 pos, uint32 len); - status_t ReadDir(uint32 count, uint64 cookie, - uint64 cookieVerf, Attribute* attrs, - uint32 attrCount); + status_t ReadDir(uint64 cookie, uint64 cookieVerf, + Attribute* attrs, uint32 attrCount); status_t ReadLink(); status_t Remove(const char* file); status_t Rename(const char* from, const char* to);