From 9c1d983eab87868914f3d1621fc028b883901cd5 Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Tue, 8 Jan 2013 23:57:24 +0100 Subject: [PATCH] nfs4: Avoid using empty string for RootInode name --- src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp index 1b6031c8a9..1d3d096454 100644 --- a/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/FileSystem.cpp @@ -190,8 +190,16 @@ FileSystem::Mount(FileSystem** _fs, RPC::Server* serv, const char* fsPath, if (name != NULL) { name++; reinterpret_cast(inode)->SetName(name); - } else + } else if (fsPath[0] != '\0') reinterpret_cast(inode)->SetName(fsPath); + else { + char* address = serv->ID().UniversalAddress(); + if (address != NULL) + reinterpret_cast(inode)->SetName(address); + else + reinterpret_cast(inode)->SetName("NFS4 Share"); + free(address); + } fs->fRoot = reinterpret_cast(inode);