[haiku-commits] BRANCH pdziepak-github.nfs4 - src/add-ons/kernel/file_systems/nfs4
- From: pdziepak-github.nfs4 <community@xxxxxxxxxxxx>
- To: haiku-commits@xxxxxxxxxxxxx
- Date: Wed, 2 Jan 2013 16:30:47 +0100 (CET)
added 2 changesets to branch 'refs/remotes/pdziepak-github/nfs4'
old head: aa5a8cb346abcd13bd7c401f2e82153b661235e3
new head: 68e64c7ab03104b2464814ec3ddcf57f008eabac
overview: https://github.com/pdziepak/Haiku/compare/aa5a8cb...68e64c7
----------------------------------------------------------------------------
fee08ed: nfs4: Fix typo: NFS4ERR_LOCKS_HELD instead of NFS4ERR_LOCK_HELD
68e64c7: nfs4: Expect file system root path to be NULL
[ Pawel Dziepak <pdziepak@xxxxxxxxxxx> ]
----------------------------------------------------------------------------
2 files changed, 7 insertions(+), 5 deletions(-)
src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp | 10 ++++++----
src/add-ons/kernel/file_systems/nfs4/NFS4Object.cpp | 2 +-
############################################################################
Commit: fee08ed6ad16a266c5dbfc70af16d17f18c6ff5d
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Wed Jan 2 15:20:06 2013 UTC
nfs4: Fix typo: NFS4ERR_LOCKS_HELD instead of NFS4ERR_LOCK_HELD
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/nfs4/NFS4Object.cpp
b/src/add-ons/kernel/file_systems/nfs4/NFS4Object.cpp
index f13d34e..c213ab9 100644
--- a/src/add-ons/kernel/file_systems/nfs4/NFS4Object.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/NFS4Object.cpp
@@ -26,7 +26,7 @@ NFS4Object::HandleErrors(uint32 nfs4Error, RPC::Server* serv,
ASSERT(nfs4Error != NFS4ERR_BAD_STATEID);
ASSERT(nfs4Error != NFS4ERR_BAD_SEQID);
ASSERT(nfs4Error != NFS4ERR_RESTOREFH);
- ASSERT(nfs4Error != NFS4ERR_LOCK_HELD);
+ ASSERT(nfs4Error != NFS4ERR_LOCKS_HELD);
ASSERT(nfs4Error != NFS4ERR_OP_ILLEGAL);
if (cookie != NULL)
############################################################################
Commit: 68e64c7ab03104b2464814ec3ddcf57f008eabac
Author: Pawel Dziepak <pdziepak@xxxxxxxxxxx>
Date: Wed Jan 2 15:26:57 2013 UTC
nfs4: Expect file system root path to be NULL
----------------------------------------------------------------------------
diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
index 66bb163..caf4037 100644
--- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
+++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp
@@ -60,17 +60,19 @@ FileSystem::~FileSystem()
static const char*
GetPath(const char* root, const char* path)
{
- ASSERT(root != NULL);
ASSERT(path != NULL);
int slash = 0;
int i;
for (i = 0; path[i] != '\0'; i++) {
- if (path[i] != root[i] || root[i] == '\0')
- break;
-
if (path[i] == '/')
slash = i;
+
+ if (root == NULL)
+ break;
+
+ if (path[i] != root[i] || root[i] == '\0')
+ break;
}
if (path[i] == '\0')
Other related posts:
