From dadd844f360f3c3b1d055177106c69324024acbd Mon Sep 17 00:00:00 2001 From: Pawel Dziepak Date: Fri, 4 Jan 2013 22:25:21 +0100 Subject: [PATCH] nfs4: Multiple style fixes --- src/add-ons/kernel/file_systems/nfs4/Connection.cpp | 4 ++-- src/add-ons/kernel/file_systems/nfs4/FileInfo.cpp | 4 ++-- src/add-ons/kernel/file_systems/nfs4/IdMap.h | 1 + src/add-ons/kernel/file_systems/nfs4/OpenState.cpp | 2 +- src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp | 2 +- 5 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/add-ons/kernel/file_systems/nfs4/Connection.cpp b/src/add-ons/kernel/file_systems/nfs4/Connection.cpp index 7191a8d1b7..e38953a3db 100644 --- a/src/add-ons/kernel/file_systems/nfs4/Connection.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/Connection.cpp @@ -563,8 +563,8 @@ Connection::SetTo(Connection **_connection, int socket, status_t Connection::Connect() { - const sockaddr& address = - *reinterpret_cast(&fPeerAddress); + const sockaddr& address + = *reinterpret_cast(&fPeerAddress); switch (fPeerAddress.fProtocol) { case IPPROTO_TCP: diff --git a/src/add-ons/kernel/file_systems/nfs4/FileInfo.cpp b/src/add-ons/kernel/file_systems/nfs4/FileInfo.cpp index ec4b073e1b..1a1edf33d0 100644 --- a/src/add-ons/kernel/file_systems/nfs4/FileInfo.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/FileInfo.cpp @@ -59,8 +59,8 @@ FileInfo::CreateName(const char* dirPath, const char* name) return B_NO_MEMORY; if (dirPath != NULL) { - char* path = reinterpret_cast(malloc(strlen(name) + 2 + - strlen(dirPath))); + char* path = reinterpret_cast(malloc(strlen(name) + 2 + + strlen(dirPath))); if (path == NULL) return B_NO_MEMORY; diff --git a/src/add-ons/kernel/file_systems/nfs4/IdMap.h b/src/add-ons/kernel/file_systems/nfs4/IdMap.h index fd89682364..daf66446cb 100644 --- a/src/add-ons/kernel/file_systems/nfs4/IdMap.h +++ b/src/add-ons/kernel/file_systems/nfs4/IdMap.h @@ -51,6 +51,7 @@ IdMap::InitStatus() return fInitStatus; } + extern IdMap* gIdMapper; extern mutex gIdMapperLock; diff --git a/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp b/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp index 446503de6a..13e2d50342 100644 --- a/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/OpenState.cpp @@ -294,7 +294,7 @@ OpenState::Close() // recognize retried CLOSE requests so we just assume that BAD_STATEID // on CLOSE request is just a result of retransmission. if (reply.NFS4Error() == NFS4ERR_BAD_STATEID) { - fFileSystem->OpenOwnerSequenceUnlock(sequence); + fFileSystem->OpenOwnerSequenceUnlock(sequence); return B_OK; } diff --git a/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp b/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp index 2933d2af7a..abc4607ea4 100644 --- a/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp +++ b/src/add-ons/kernel/file_systems/nfs4/kernel_interface.cpp @@ -716,7 +716,7 @@ get_new_vnode(fs_volume* volume, ino_t id, VnodeToInode** _vti) return B_OK; } - return get_vnode(volume, id, reinterpret_cast(_vti)); //_OK; + return get_vnode(volume, id, reinterpret_cast(_vti)); }