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

Fix #8420: NetFS does not compile with DEBUG

Browse Source 
Debug macros like PRINT, ERROR, etc. are defined differently in NetFS
and UserlandFS. In NetFS they use single parentheses while in UserlandFS
double parentheses are required. Somehow this got mixed up in NetFS and
there were both styles of calling these macros what caused the incorrect
one to produce compilation errors.

Signed-off-by: Ingo Weinhold <[email protected]>
This commit is contained in:
Pawel Dziepak
2012-04-07 19:10:52 +02:00
committed by Ingo Weinhold
parent 0c38373fff
commit 3c1afd351d
14 changed files with 224 additions and 198 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/netfs/client/RootVolume.cpp
+10 -10
View File
@@ -152,8 +152,8 @@ RootVolume::IOCtl(Node* node, void* cookie, int cmd, void* buffer,
|| serverNameLen == sizeof(params->serverName)) { || serverNameLen == sizeof(params->serverName)) {
return B_BAD_VALUE; return B_BAD_VALUE;
} }
PRINT(("RootVolume::IOCtl(): NET_FS_IOCTL_ADD_SERVER: `%s'\n", PRINT("RootVolume::IOCtl(): NET_FS_IOCTL_ADD_SERVER: "
params->serverName)); "`%s'\n", params->serverName);
// get the server address // get the server address
NetAddress netAddress; NetAddress netAddress;
@@ -178,8 +178,8 @@ RootVolume::IOCtl(Node* node, void* cookie, int cmd, void* buffer,
|| serverNameLen == sizeof(params->serverName)) { || serverNameLen == sizeof(params->serverName)) {
return B_BAD_VALUE; return B_BAD_VALUE;
} }
PRINT(("RootVolume::IOCtl(): NET_FS_IOCTL_REMOVE_SERVER: `%s'\n", PRINT("RootVolume::IOCtl(): NET_FS_IOCTL_REMOVE_SERVER:"
params->serverName)); " `%s'\n", params->serverName);
// get the server volume // get the server volume
ServerVolume* serverVolume = _GetServerVolume(params->serverName); ServerVolume* serverVolume = _GetServerVolume(params->serverName);
@@ -193,7 +193,7 @@ RootVolume::IOCtl(Node* node, void* cookie, int cmd, void* buffer,
return B_OK; return B_OK;
} }
default: default:
PRINT(("RootVolume::IOCtl(): unknown ioctl: %d\n", cmd)); PRINT("RootVolume::IOCtl(): unknown ioctl: %d\n", cmd);
return B_BAD_VALUE; return B_BAD_VALUE;
break; break;
} }
@@ -207,12 +207,12 @@ RootVolume::IOCtl(Node* node, void* cookie, int cmd, void* buffer,
void void
RootVolume::ServerAdded(ExtendedServerInfo* serverInfo) RootVolume::ServerAdded(ExtendedServerInfo* serverInfo)
{ {
PRINT(("RootVolume::ServerAdded(%s)\n", serverInfo->GetServerName())); PRINT("RootVolume::ServerAdded(%s)\n", serverInfo->GetServerName());
// check, if the server does already exist // check, if the server does already exist
ServerVolume* serverVolume = _GetServerVolume(serverInfo->GetAddress()); ServerVolume* serverVolume = _GetServerVolume(serverInfo->GetAddress());
if (serverVolume) { if (serverVolume) {
WARN(("RootVolume::ServerAdded(): WARNING: ServerVolume does already " WARN("RootVolume::ServerAdded(): WARNING: ServerVolume does "
"exist.\n")); "already exist.\n");
serverVolume->PutVolume(); serverVolume->PutVolume();
return; return;
} }
@@ -258,7 +258,7 @@ void
RootVolume::ServerUpdated(ExtendedServerInfo* oldInfo, RootVolume::ServerUpdated(ExtendedServerInfo* oldInfo,
ExtendedServerInfo* newInfo) ExtendedServerInfo* newInfo)
{ {
PRINT(("RootVolume::ServerUpdated(%s)\n", newInfo->GetServerName())); PRINT("RootVolume::ServerUpdated(%s)\n", newInfo->GetServerName());
// get the volume // get the volume
ServerVolume* serverVolume = _GetServerVolume(newInfo->GetAddress()); ServerVolume* serverVolume = _GetServerVolume(newInfo->GetAddress());
if (!serverVolume) if (!serverVolume)
@@ -273,7 +273,7 @@ PRINT(("RootVolume::ServerUpdated(%s)\n", newInfo->GetServerName()));
void void
RootVolume::ServerRemoved(ExtendedServerInfo* serverInfo) RootVolume::ServerRemoved(ExtendedServerInfo* serverInfo)
{ {
PRINT(("RootVolume::ServerRemoved(%s)\n", serverInfo->GetServerName())); PRINT("RootVolume::ServerRemoved(%s)\n", serverInfo->GetServerName());
// get the volume // get the volume
ServerVolume* serverVolume = _GetServerVolume(serverInfo->GetAddress()); ServerVolume* serverVolume = _GetServerVolume(serverInfo->GetAddress());
if (!serverVolume) if (!serverVolume)
src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp
+12 -10
View File
@@ -303,28 +303,30 @@ ServerManager::_BroadcastListener()
ssize_t bytesRead = recvfrom(fBroadcastListenerSocket, &message, ssize_t bytesRead = recvfrom(fBroadcastListenerSocket, &message,
sizeof(message), 0, (sockaddr*)&addr, &addrSize); sizeof(message), 0, (sockaddr*)&addr, &addrSize);
if (bytesRead < 0) { if (bytesRead < 0) {
PRINT(("ServerManager::_BroadcastListener(): recvfrom() failed: %s\n", PRINT("ServerManager::_BroadcastListener(): recvfrom() "
strerror(errno))); "failed: %s\n", strerror(errno));
continue; continue;
} }
// check message size, magic, and protocol version // check message size, magic, and protocol version
if (bytesRead != sizeof(BroadcastMessage)) { if (bytesRead != sizeof(BroadcastMessage)) {
PRINT(("ServerManager::_BroadcastListener(): received %ld bytes, but " PRINT("ServerManager::_BroadcastListener(): received "
"it should be %lu\n", bytesRead, sizeof(BroadcastMessage))); "%ld bytes, but it should be %lu\n", bytesRead,
sizeof(BroadcastMessage));
continue; continue;
} }
if (message.magic != B_HOST_TO_BENDIAN_INT32(BROADCAST_MESSAGE_MAGIC)) { if (message.magic != B_HOST_TO_BENDIAN_INT32(BROADCAST_MESSAGE_MAGIC)) {
PRINT(("ServerManager::_BroadcastListener(): message has bad " PRINT("ServerManager::_BroadcastListener(): message has"
"magic.\n")); " bad magic.\n");
continue; continue;
} }
if (message.protocolVersion if (message.protocolVersion
!= (int32)B_HOST_TO_BENDIAN_INT32(NETFS_PROTOCOL_VERSION)) { != (int32)B_HOST_TO_BENDIAN_INT32(NETFS_PROTOCOL_VERSION)) {
PRINT(("ServerManager::_BroadcastListener(): protocol version " PRINT("ServerManager::_BroadcastListener(): protocol "
"does not match: %lu vs. %d.\n", "version does not match: %lu vs. %d.\n",
B_BENDIAN_TO_HOST_INT32(message.protocolVersion), B_BENDIAN_TO_HOST_INT32(
NETFS_PROTOCOL_VERSION)); message.protocolVersion),
NETFS_PROTOCOL_VERSION);
continue; continue;
} }
src/add-ons/kernel/file_systems/netfs/client/ServerVolume.cpp
+3 -2
View File
@@ -77,7 +77,7 @@ ServerVolume::SetServerInfo(ExtendedServerInfo* serverInfo)
fLock.Unlock(); fLock.Unlock();
if (remove) { if (remove) {
PRINT((" removing share: %s\n", name)); PRINT(" removing share: %s\n", name);
if (Volume* volume = GetChildVolume(name)) { if (Volume* volume = GetChildVolume(name)) {
volume->SetUnmounting(true); volume->SetUnmounting(true);
volume->PutVolume(); volume->PutVolume();
@@ -101,7 +101,8 @@ ServerVolume::SetServerInfo(ExtendedServerInfo* serverInfo)
if (volume) { if (volume) {
volume->PutVolume(); volume->PutVolume();
} else { } else {
PRINT((" adding share: %s\n", shareInfo->GetShareName())); PRINT(" adding share: %s\n",
shareInfo->GetShareName());
status_t error = _AddShare(shareInfo); status_t error = _AddShare(shareInfo);
if (error != B_OK) { if (error != B_OK) {
ERROR("ServerVolume::SetServerInfo(): ERROR: Failed to add " ERROR("ServerVolume::SetServerInfo(): ERROR: Failed to add "
src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp
+29 -17
View File
@@ -353,7 +353,7 @@ PRINT(("ShareVolume::PrepareToUnmount()\n"));
int32 count = fNodes->Size(); int32 count = fNodes->Size();
if (count == 0) if (count == 0)
return; return;
PRINT((" %ld nodes to remove\n", count)); PRINT(" %ld nodes to remove\n", count);
vnode_id* ids = new(std::nothrow) vnode_id[count]; vnode_id* ids = new(std::nothrow) vnode_id[count];
if (!ids) { if (!ids) {
ERROR("ShareVolume::PrepareToUnmount(): ERROR: Insufficient memory to " ERROR("ShareVolume::PrepareToUnmount(): ERROR: Insufficient memory to "
@@ -395,7 +395,7 @@ PRINT((" %ld nodes to remove\n", count));
for (int32 i = 0; i < count; i++) { for (int32 i = 0; i < count; i++) {
Node* node; Node* node;
if (GetVNode(ids[i], &node) == B_OK) { if (GetVNode(ids[i], &node) == B_OK) {
PRINT((" removing node %lld\n", ids[i])); PRINT(" removing node %lld\n", ids[i]);
Volume::RemoveVNode(ids[i]); Volume::RemoveVNode(ids[i]);
PutVNode(ids[i]); PutVNode(ids[i]);
} }
@@ -1166,8 +1166,9 @@ ShareVolume::OpenDir(Node* _node, void** _cookie)
ObjectDeleter<Request> replyDeleter(reply); ObjectDeleter<Request> replyDeleter(reply);
if (reply->error != B_OK) if (reply->error != B_OK)
{ {
PRINT(("OpenDir() failed: node: %lld, remote: (%ld, %lld)\n", PRINT("OpenDir() failed: node: %lld, remote: (%ld, %lld)\n",
node->GetID(), node->GetRemoteID().volumeID, node->GetRemoteID().nodeID)); node->GetID(), node->GetRemoteID().volumeID,
node->GetRemoteID().nodeID);
RETURN_ERROR(reply->error); RETURN_ERROR(reply->error);
} }
@@ -2017,10 +2018,10 @@ ShareVolume::GetQueryEntry(const EntryInfo& entryInfo,
buffer->d_ino = localNodeID; buffer->d_ino = localNodeID;
*countRead = 1; *countRead = 1;
PRINT((" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld, d_pino: %Ld, " PRINT(" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld, d_pino: %Ld, "
"d_reclen: %hu, d_name: `%s'\n", "d_reclen: %hu, d_name: `%s'\n", buffer->d_dev, buffer->d_pdev,
buffer->d_dev, buffer->d_pdev, buffer->d_ino, buffer->d_pino, buffer->d_ino, buffer->d_pino, buffer->d_reclen,
buffer->d_reclen, buffer->d_name)); buffer->d_name);
return B_OK; return B_OK;
} }
@@ -2171,7 +2172,12 @@ ShareVolume::_HandleEntryCreatedRequest(EntryCreatedRequest* request)
status_t error = _GetLocalNodeID(request->directoryID, &vnida, true); status_t error = _GetLocalNodeID(request->directoryID, &vnida, true);
if (error == B_OK) if (error == B_OK)
error = _GetLocalNodeID(request->nodeID, &vnidc, true); error = _GetLocalNodeID(request->nodeID, &vnidc, true);
PRINT(("ShareVolume::_HandleEntryCreatedRequest(): error: 0x%lx, name: \"%s\", dir: %lld (remote: (%ld, %lld)), node: %lld (remote: (%ld, %lld))\n", error, name, vnida, request->directoryID.volumeID, request->directoryID.nodeID, vnidc, request->nodeID.volumeID, request->nodeID.nodeID)); PRINT("ShareVolume::_HandleEntryCreatedRequest(): error: 0x%lx,"
" name: \"%s\", dir: %lld (remote: (%ld, %lld)), node:"
" %lld (remote: (%ld, %lld))\n", error, name, vnida,
request->directoryID.volumeID,
request->directoryID.nodeID, vnidc,
request->nodeID.volumeID, request->nodeID.nodeID);
// send notifications / do additional processing // send notifications / do additional processing
if (request->queryUpdate) { if (request->queryUpdate) {
@@ -2363,8 +2369,9 @@ ShareVolume::_GetLocalNodeID(NodeID remoteID, ino_t* _localID, bool enter)
fVolumeManager->RemoveNodeID(localID); fVolumeManager->RemoveNodeID(localID);
return error; return error;
} }
PRINT(("ShareVolume(%ld): added node ID mapping: local: %lld -> " PRINT("ShareVolume(%ld): added node ID mapping: local: %lld -> "
"remote: (%ld, %lld)\n", fID, localID, remoteID.volumeID, remoteID.nodeID)); "remote: (%ld, %lld)\n", fID, localID, remoteID.volumeID,
remoteID.nodeID);
*_localID = localID; *_localID = localID;
return B_OK; return B_OK;
@@ -2396,7 +2403,8 @@ ShareVolume::_RemoveLocalNodeID(ino_t localID)
// remove from ID maps // remove from ID maps
NodeID remoteID = fRemoteNodeIDs->Get(localID); NodeID remoteID = fRemoteNodeIDs->Get(localID);
PRINT(("ShareVolume::_RemoveLocalNodeID(%lld): remote: (%ld, %lld)\n", localID, remoteID.volumeID, remoteID.nodeID)); PRINT("ShareVolume::_RemoveLocalNodeID(%lld): remote: (%ld, %lld)\n",
localID, remoteID.volumeID, remoteID.nodeID);
fRemoteNodeIDs->Remove(localID); fRemoteNodeIDs->Remove(localID);
fLocalNodeIDs->Remove(remoteID); fLocalNodeIDs->Remove(remoteID);
@@ -2463,9 +2471,10 @@ ShareVolume::_LoadNode(const NodeInfo& nodeInfo, ShareNode** _node)
delete node; delete node;
return error; return error;
} }
PRINT(("ShareVolume: added node: %lld: remote: (%ld, %lld), localID: %lld\n", PRINT("ShareVolume: added node: %lld: remote: (%ld, %lld),"
node->GetID(), node->GetRemoteID().volumeID, node->GetRemoteID().nodeID, " localID: %lld\n", node->GetID(),
localID)); node->GetRemoteID().volumeID,
node->GetRemoteID().nodeID, localID);
} }
if (_node) if (_node)
@@ -3023,7 +3032,7 @@ ShareVolume::_MountShare()
// get the share name // get the share name
const char* share = shareInfo->GetShareName(); const char* share = shareInfo->GetShareName();
PRINT(("ShareVolume::_MountShare(%s, %s)\n", server, share)); PRINT("ShareVolume::_MountShare(%s, %s)\n", server, share);
// init a connection to the authentication server // init a connection to the authentication server
AuthenticationServer authenticationServer; AuthenticationServer authenticationServer;
error = authenticationServer.InitCheck(); error = authenticationServer.InitCheck();
@@ -3094,7 +3103,10 @@ PRINT(("ShareVolume::_MountShare(%s, %s)\n", server, share));
fLocalNodeIDs->Remove(fRootNode->GetRemoteID()); fLocalNodeIDs->Remove(fRootNode->GetRemoteID());
RETURN_ERROR(error); RETURN_ERROR(error);
} }
PRINT(("ShareVolume::_MountShare(): root node: local: %lld, remote: (%ld, %lld)\n", fRootNode->GetID(), fRootNode->GetRemoteID().volumeID, fRootNode->GetRemoteID().nodeID)); PRINT("ShareVolume::_MountShare(): root node: local: %lld, remote: "
"(%ld, %lld)\n", fRootNode->GetID(),
fRootNode->GetRemoteID().volumeID,
fRootNode->GetRemoteID().nodeID);
// Add ourselves to the server connection, so that we can receive // Add ourselves to the server connection, so that we can receive
// node monitoring events. There a race condition: We might already // node monitoring events. There a race condition: We might already
src/add-ons/kernel/file_systems/netfs/client/Volume.cpp
+3 -1
View File
@@ -172,7 +172,9 @@ Volume::SendNotification(port_id port, int32 token, uint32 what, int32 op,
nspace_id nsida, nspace_id nsidb, vnode_id vnida, vnode_id vnidb, nspace_id nsida, nspace_id nsidb, vnode_id vnida, vnode_id vnidb,
vnode_id vnidc, const char *name) vnode_id vnidc, const char *name)
{ {
PRINT(("Volume::SendNotification(%ld, %ld, 0x%lx, 0x%lx, %ld, %ld, %lld, %lld, %lld, \"%s\")\n", port, token, what, op, nsida, nsidb, vnida, vnidb, vnidc, name)); PRINT("Volume::SendNotification(%ld, %ld, 0x%lx, 0x%lx, %ld, %ld, %lld,"
" %lld, %lld, \"%s\")\n", port, token, what, op, nsida, nsidb,
vnida, vnidb, vnidc, name);
return send_notification(port, token, what, op, nsida, nsidb, vnida, return send_notification(port, token, what, op, nsida, nsidb, vnida,
vnidb, vnidc, name); vnidb, vnidc, name);
} }
src/add-ons/kernel/file_systems/netfs/client/VolumeManager.cpp
+2 -2
View File
@@ -333,8 +333,8 @@ VolumeManager::PutVolume(Volume* volume)
{ {
AutoLocker<Locker> locker(this); AutoLocker<Locker> locker(this);
if (volume->ReleaseReference() && volume->IsRemoved()) { if (volume->ReleaseReference() && volume->IsRemoved()) {
PRINT(("VolumeManager::PutVolume(%p): Removed volume unreferenced. " PRINT("VolumeManager::PutVolume(%p): Removed volume "
"Unmounting...\n", volume)); "unreferenced. Unmounting...\n", volume);
// remove from volume set -- now noone can get a reference to it // remove from volume set -- now noone can get a reference to it
// anymore // anymore
fVolumes->Remove(volume); fVolumes->Remove(volume);
src/add-ons/kernel/file_systems/netfs/client/netfs.cpp
+107 -107
View File
@@ -224,7 +224,7 @@ netfs_unmount(void *ns)
{ {
VolumeManager* volumeManager = (VolumeManager*)ns; VolumeManager* volumeManager = (VolumeManager*)ns;
PRINT(("netfs_unmount()\n")); PRINT("netfs_unmount()\n");
volumeManager->UnmountRootVolume(); volumeManager->UnmountRootVolume();
delete volumeManager; delete volumeManager;
@@ -233,7 +233,7 @@ netfs_unmount(void *ns)
ObjectTracker::ExitDefault(); ObjectTracker::ExitDefault();
#endif #endif
PRINT(("netfs_unmount() done\n")); PRINT("netfs_unmount() done\n");
exit_debugging(); exit_debugging();
return B_OK; return B_OK;
@@ -250,13 +250,13 @@ netfs_sync(void *ns)
Volume* volume = volumeManager->GetRootVolume(); Volume* volume = volumeManager->GetRootVolume();
VolumePutter _(volume); VolumePutter _(volume);
PRINT(("netfs_sync(%p)\n", ns)); PRINT("netfs_sync(%p)\n", ns);
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) if (volume)
error = volume->Sync(); error = volume->Sync();
PRINT(("netfs_sync() done: %lx \n", error)); PRINT("netfs_sync() done: %lx \n", error);
return error; return error;
} }
@@ -272,13 +272,13 @@ netfs_read_fs_stat(void *ns, struct fs_info *info)
Volume* volume = volumeManager->GetRootVolume(); Volume* volume = volumeManager->GetRootVolume();
VolumePutter _(volume); VolumePutter _(volume);
PRINT(("netfs_read_fs_stat(%p, %p)\n", ns, info)); PRINT("netfs_read_fs_stat(%p, %p)\n", ns, info);
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) if (volume)
error = volume->ReadFSStat(info); error = volume->ReadFSStat(info);
PRINT(("netfs_read_fs_stat() done: %lx \n", error)); PRINT("netfs_read_fs_stat() done: %lx \n", error);
return error; return error;
} }
@@ -294,13 +294,13 @@ netfs_write_fs_stat(void *ns, struct fs_info *info, long mask)
Volume* volume = volumeManager->GetRootVolume(); Volume* volume = volumeManager->GetRootVolume();
VolumePutter _(volume); VolumePutter _(volume);
PRINT(("netfs_write_fs_stat(%p, %p, %ld)\n", ns, info, mask)); PRINT("netfs_write_fs_stat(%p, %p, %ld)\n", ns, info, mask);
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) if (volume)
error = volume->WriteFSStat(info, mask); error = volume->WriteFSStat(info, mask);
PRINT(("netfs_write_fs_stat() done: %lx \n", error)); PRINT("netfs_write_fs_stat() done: %lx \n", error);
return error; return error;
} }
@@ -319,13 +319,13 @@ netfs_read_vnode(void *ns, vnode_id vnid, char reenter, void **node)
Volume* volume = volumeManager->GetVolume(vnid); Volume* volume = volumeManager->GetVolume(vnid);
VolumePutter _(volume); VolumePutter _(volume);
PRINT(("netfs_read_vnode(%p, %Ld, %d, %p)\n", ns, vnid, reenter, node)); PRINT("netfs_read_vnode(%p, %Ld, %d, %p)\n", ns, vnid, reenter, node);
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) if (volume)
error = volume->ReadVNode(vnid, reenter, (Node**)node); error = volume->ReadVNode(vnid, reenter, (Node**)node);
PRINT(("netfs_read_vnode() done: (%lx, %p)\n", error, *node)); PRINT("netfs_read_vnode() done: (%lx, %p)\n", error, *node);
return error; return error;
} }
@@ -371,9 +371,9 @@ int
netfs_fsync(void *ns, void *_node) netfs_fsync(void *ns, void *_node)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_fsync(%p, %p)\n", ns, node)); PRINT("netfs_fsync(%p, %p)\n", ns, node);
status_t error = node->GetVolume()->FSync(node); status_t error = node->GetVolume()->FSync(node);
PRINT(("netfs_fsync() done: %lx\n", error)); PRINT("netfs_fsync() done: %lx\n", error);
return error; return error;
} }
@@ -385,9 +385,9 @@ int
netfs_read_stat(void *ns, void *_node, struct stat *st) netfs_read_stat(void *ns, void *_node, struct stat *st)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_read_stat(%p, %p, %p)\n", ns, node, st)); PRINT("netfs_read_stat(%p, %p, %p)\n", ns, node, st);
status_t error = node->GetVolume()->ReadStat(node, st); status_t error = node->GetVolume()->ReadStat(node, st);
PRINT(("netfs_read_stat() done: %lx\n", error)); PRINT("netfs_read_stat() done: %lx\n", error);
return error; return error;
} }
@@ -397,9 +397,9 @@ int
netfs_write_stat(void *ns, void *_node, struct stat *st, long mask) netfs_write_stat(void *ns, void *_node, struct stat *st, long mask)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_write_stat(%p, %p, %p, %ld)\n", ns, node, st, mask)); PRINT("netfs_write_stat(%p, %p, %p, %ld)\n", ns, node, st, mask);
status_t error = node->GetVolume()->WriteStat(node, st, mask); status_t error = node->GetVolume()->WriteStat(node, st, mask);
PRINT(("netfs_write_stat() done: %lx\n", error)); PRINT("netfs_write_stat() done: %lx\n", error);
return error; return error;
} }
@@ -409,9 +409,9 @@ int
netfs_access(void *ns, void *_node, int mode) netfs_access(void *ns, void *_node, int mode)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_access(%p, %p, %d)\n", ns, node, mode)); PRINT("netfs_access(%p, %p, %d)\n", ns, node, mode);
status_t error = node->GetVolume()->Access(node, mode); status_t error = node->GetVolume()->Access(node, mode);
PRINT(("netfs_access() done: %lx\n", error)); PRINT("netfs_access() done: %lx\n", error);
return error; return error;
} }
@@ -425,12 +425,12 @@ netfs_create(void *ns, void *_dir, const char *name, int openMode, int mode,
vnode_id *vnid, void **cookie) vnode_id *vnid, void **cookie)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
PRINT(("netfs_create(%p, %p, `%s', %d, %d, %p, %p)\n", ns, dir, PRINT("netfs_create(%p, %p, `%s', %d, %d, %p, %p)\n", ns, dir,
name, openMode, mode, vnid, cookie)); name, openMode, mode, vnid, cookie);
status_t error = dir->GetVolume()->Create(dir, name, openMode, mode, vnid, status_t error = dir->GetVolume()->Create(dir, name, openMode, mode, vnid,
cookie); cookie);
PRINT(("netfs_create() done: (%lx, %Ld, %p)\n", error, *vnid, PRINT("netfs_create() done: (%lx, %Ld, %p)\n", error, *vnid,
*cookie)); *cookie);
return error; return error;
} }
@@ -440,9 +440,9 @@ int
netfs_open(void *ns, void *_node, int openMode, void **cookie) netfs_open(void *ns, void *_node, int openMode, void **cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_open(%p, %p, %d)\n", ns, node, openMode)); PRINT("netfs_open(%p, %p, %d)\n", ns, node, openMode);
status_t error = node->GetVolume()->Open(node, openMode, cookie); status_t error = node->GetVolume()->Open(node, openMode, cookie);
PRINT(("netfs_open() done: (%lx, %p)\n", error, *cookie)); PRINT("netfs_open() done: (%lx, %p)\n", error, *cookie);
return error; return error;
} }
@@ -452,9 +452,9 @@ int
netfs_close(void *ns, void *_node, void *cookie) netfs_close(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_close(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_close(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->Close(node, cookie); status_t error = node->GetVolume()->Close(node, cookie);
PRINT(("netfs_close() done: %lx\n", error)); PRINT("netfs_close() done: %lx\n", error);
return error; return error;
} }
@@ -464,9 +464,9 @@ int
netfs_free_cookie(void *ns, void *_node, void *cookie) netfs_free_cookie(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_free_cookie(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_free_cookie(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->FreeCookie(node, cookie); status_t error = node->GetVolume()->FreeCookie(node, cookie);
PRINT(("netfs_free_cookie() done: %lx\n", error)); PRINT("netfs_free_cookie() done: %lx\n", error);
return error; return error;
} }
@@ -477,11 +477,11 @@ netfs_read(void *ns, void *_node, void *cookie, off_t pos, void *buffer,
size_t *bufferSize) size_t *bufferSize)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_read(%p, %p, %p, %Ld, %p, %lu)\n", ns, node, cookie, pos, PRINT("netfs_read(%p, %p, %p, %Ld, %p, %lu)\n", ns, node, cookie, pos,
buffer, *bufferSize)); buffer, *bufferSize);
status_t error = node->GetVolume()->Read(node, cookie, pos, buffer, status_t error = node->GetVolume()->Read(node, cookie, pos, buffer,
*bufferSize, bufferSize); *bufferSize, bufferSize);
PRINT(("netfs_read() done: (%lx, %lu)\n", error, *bufferSize)); PRINT("netfs_read() done: (%lx, %lu)\n", error, *bufferSize);
return error; return error;
} }
@@ -492,11 +492,11 @@ netfs_write(void *ns, void *_node, void *cookie, off_t pos,
const void *buffer, size_t *bufferSize) const void *buffer, size_t *bufferSize)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_write(%p, %p, %p, %Ld, %p, %lu)\n", ns, node, cookie, pos, PRINT("netfs_write(%p, %p, %p, %Ld, %p, %lu)\n", ns, node, cookie, pos,
buffer, *bufferSize)); buffer, *bufferSize);
status_t error = node->GetVolume()->Write(node, cookie, pos, buffer, status_t error = node->GetVolume()->Write(node, cookie, pos, buffer,
*bufferSize, bufferSize); *bufferSize, bufferSize);
PRINT(("netfs_write() done: (%lx, %lu)\n", error, *bufferSize)); PRINT("netfs_write() done: (%lx, %lu)\n", error, *bufferSize);
return error; return error;
} }
@@ -507,11 +507,11 @@ netfs_ioctl(void *ns, void *_node, void *cookie, int cmd, void *buffer,
size_t bufferSize) size_t bufferSize)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_ioctl(%p, %p, %p, %d, %p, %lu)\n", ns, node, cookie, cmd, PRINT("netfs_ioctl(%p, %p, %p, %d, %p, %lu)\n", ns, node, cookie, cmd,
buffer, bufferSize)); buffer, bufferSize);
status_t error = node->GetVolume()->IOCtl(node, cookie, cmd, buffer, status_t error = node->GetVolume()->IOCtl(node, cookie, cmd, buffer,
bufferSize); bufferSize);
PRINT(("netfs_ioctl() done: (%lx)\n", error)); PRINT("netfs_ioctl() done: (%lx)\n", error);
return error; return error;
} }
@@ -537,9 +537,9 @@ netfs_link(void *ns, void *_dir, const char *name, void *_node)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_link(%p, %p, `%s', %p)\n", ns, dir, name, node)); PRINT("netfs_link(%p, %p, `%s', %p)\n", ns, dir, name, node);
status_t error = dir->GetVolume()->Link(dir, name, node); status_t error = dir->GetVolume()->Link(dir, name, node);
PRINT(("netfs_link() done: (%lx)\n", error)); PRINT("netfs_link() done: (%lx)\n", error);
return error; return error;
} }
@@ -549,9 +549,9 @@ int
netfs_unlink(void *ns, void *_dir, const char *name) netfs_unlink(void *ns, void *_dir, const char *name)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
PRINT(("netfs_unlink(%p, %p, `%s')\n", ns, dir, name)); PRINT("netfs_unlink(%p, %p, `%s')\n", ns, dir, name);
status_t error = dir->GetVolume()->Unlink(dir, name); status_t error = dir->GetVolume()->Unlink(dir, name);
PRINT(("netfs_unlink() done: (%lx)\n", error)); PRINT("netfs_unlink() done: (%lx)\n", error);
return error; return error;
} }
@@ -561,9 +561,9 @@ int
netfs_symlink(void *ns, void *_dir, const char *name, const char *path) netfs_symlink(void *ns, void *_dir, const char *name, const char *path)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
PRINT(("netfs_symlink(%p, %p, `%s', `%s')\n", ns, dir, name, path)); PRINT("netfs_symlink(%p, %p, `%s', `%s')\n", ns, dir, name, path);
status_t error = dir->GetVolume()->Symlink(dir, name, path); status_t error = dir->GetVolume()->Symlink(dir, name, path);
PRINT(("netfs_symlink() done: (%lx)\n", error)); PRINT("netfs_symlink() done: (%lx)\n", error);
return error; return error;
} }
@@ -573,11 +573,11 @@ int
netfs_read_link(void *ns, void *_node, char *buffer, size_t *bufferSize) netfs_read_link(void *ns, void *_node, char *buffer, size_t *bufferSize)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_read_link(%p, %p, %p, %lu)\n", ns, node, buffer, PRINT("netfs_read_link(%p, %p, %p, %lu)\n", ns, node, buffer,
*bufferSize)); *bufferSize);
status_t error = node->GetVolume()->ReadLink(node, buffer, *bufferSize, status_t error = node->GetVolume()->ReadLink(node, buffer, *bufferSize,
bufferSize); bufferSize);
PRINT(("netfs_read_link() done: (%lx, %lu)\n", error, *bufferSize)); PRINT("netfs_read_link() done: (%lx, %lu)\n", error, *bufferSize);
return error; return error;
} }
@@ -589,11 +589,11 @@ netfs_rename(void *ns, void *_oldDir, const char *oldName, void *_newDir,
{ {
Node* oldDir = (Node*)_oldDir; Node* oldDir = (Node*)_oldDir;
Node* newDir = (Node*)_newDir; Node* newDir = (Node*)_newDir;
PRINT(("netfs_rename(%p, %p, `%s', %p, `%s')\n", ns, oldDir, oldName, PRINT("netfs_rename(%p, %p, `%s', %p, `%s')\n", ns, oldDir, oldName,
newDir, newName)); newDir, newName);
status_t error = oldDir->GetVolume()->Rename(oldDir, oldName, status_t error = oldDir->GetVolume()->Rename(oldDir, oldName,
newDir, newName); newDir, newName);
PRINT(("netfs_rename() done: (%lx)\n", error)); PRINT("netfs_rename() done: (%lx)\n", error);
return error; return error;
} }
@@ -606,9 +606,9 @@ int
netfs_mkdir(void *ns, void *_dir, const char *name, int mode) netfs_mkdir(void *ns, void *_dir, const char *name, int mode)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
PRINT(("netfs_mkdir(%p, %p, `%s', %d)\n", ns, dir, name, mode)); PRINT("netfs_mkdir(%p, %p, `%s', %d)\n", ns, dir, name, mode);
status_t error = dir->GetVolume()->MkDir(dir, name, mode); status_t error = dir->GetVolume()->MkDir(dir, name, mode);
PRINT(("netfs_mkdir() done: (%lx)\n", error)); PRINT("netfs_mkdir() done: (%lx)\n", error);
return error; return error;
} }
@@ -618,9 +618,9 @@ int
netfs_rmdir(void *ns, void *_dir, const char *name) netfs_rmdir(void *ns, void *_dir, const char *name)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
PRINT(("netfs_rmdir(%p, %p, `%s')\n", ns, dir, name)); PRINT("netfs_rmdir(%p, %p, `%s')\n", ns, dir, name);
status_t error = dir->GetVolume()->RmDir(dir, name); status_t error = dir->GetVolume()->RmDir(dir, name);
PRINT(("netfs_rmdir() done: (%lx)\n", error)); PRINT("netfs_rmdir() done: (%lx)\n", error);
return error; return error;
} }
@@ -630,9 +630,9 @@ int
netfs_open_dir(void *ns, void *_node, void **cookie) netfs_open_dir(void *ns, void *_node, void **cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_open_dir(%p, %p)\n", ns, node)); PRINT("netfs_open_dir(%p, %p)\n", ns, node);
status_t error = node->GetVolume()->OpenDir(node, cookie); status_t error = node->GetVolume()->OpenDir(node, cookie);
PRINT(("netfs_open_dir() done: (%lx, %p)\n", error, *cookie)); PRINT("netfs_open_dir() done: (%lx, %p)\n", error, *cookie);
return error; return error;
} }
@@ -642,9 +642,9 @@ int
netfs_close_dir(void *ns, void *_node, void *cookie) netfs_close_dir(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_close_dir(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_close_dir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->CloseDir(node, cookie); status_t error = node->GetVolume()->CloseDir(node, cookie);
PRINT(("netfs_close_dir() done: %lx\n", error)); PRINT("netfs_close_dir() done: %lx\n", error);
return error; return error;
} }
@@ -654,9 +654,9 @@ int
netfs_free_dir_cookie(void *ns, void *_node, void *cookie) netfs_free_dir_cookie(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_free_dir_cookie(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_free_dir_cookie(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->FreeDirCookie(node, cookie); status_t error = node->GetVolume()->FreeDirCookie(node, cookie);
PRINT(("netfs_free_dir_cookie() done: %lx \n", error)); PRINT("netfs_free_dir_cookie() done: %lx \n", error);
return error; return error;
} }
@@ -667,11 +667,11 @@ netfs_read_dir(void *ns, void *_node, void *cookie, long *count,
struct dirent *buffer, size_t bufferSize) struct dirent *buffer, size_t bufferSize)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_read_dir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, cookie, PRINT("netfs_read_dir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, cookie,
*count, buffer, bufferSize)); *count, buffer, bufferSize);
status_t error = node->GetVolume()->ReadDir(node, cookie, buffer, status_t error = node->GetVolume()->ReadDir(node, cookie, buffer,
bufferSize, *count, count); bufferSize, *count, count);
PRINT(("netfs_read_dir() done: (%lx, %ld)\n", error, *count)); PRINT("netfs_read_dir() done: (%lx, %ld)\n", error, *count);
#if DEBUG #if DEBUG
dirent* entry = buffer; dirent* entry = buffer;
for (int32 i = 0; i < *count; i++) { for (int32 i = 0; i < *count; i++) {
@@ -681,10 +681,10 @@ netfs_read_dir(void *ns, void *_node, void *cookie, long *count,
int nameLen = strnlen(entry->d_name, B_FILE_NAME_LENGTH - 1); int nameLen = strnlen(entry->d_name, B_FILE_NAME_LENGTH - 1);
strncpy(name, entry->d_name, nameLen); strncpy(name, entry->d_name, nameLen);
name[nameLen] = '\0'; name[nameLen] = '\0';
PRINT((" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld, d_pino: %Ld, " PRINT(" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld,"
"d_reclen: %hu, d_name: `%s'\n", " d_pino: %Ld, d_reclen: %hu, d_name: `%s'\n",
entry->d_dev, entry->d_pdev, entry->d_ino, entry->d_pino, entry->d_dev, entry->d_pdev, entry->d_ino,
entry->d_reclen, name)); entry->d_pino, entry->d_reclen, name);
entry = (dirent*)((char*)entry + entry->d_reclen); entry = (dirent*)((char*)entry + entry->d_reclen);
} }
#endif #endif
@@ -698,9 +698,9 @@ int
netfs_rewind_dir(void *ns, void *_node, void *cookie) netfs_rewind_dir(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_rewind_dir(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_rewind_dir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->RewindDir(node, cookie); status_t error = node->GetVolume()->RewindDir(node, cookie);
PRINT(("netfs_rewind_dir() done: %lx\n", error)); PRINT("netfs_rewind_dir() done: %lx\n", error);
return error; return error;
} }
@@ -711,11 +711,11 @@ netfs_walk(void *ns, void *_dir, const char *entryName,
char **resolvedPath, vnode_id *vnid) char **resolvedPath, vnode_id *vnid)
{ {
Node* dir = (Node*)_dir; Node* dir = (Node*)_dir;
PRINT(("netfs_walk(%p, %p, `%s', %p, %p)\n", ns, dir, PRINT("netfs_walk(%p, %p, `%s', %p, %p)\n", ns, dir,
entryName, resolvedPath, vnid)); entryName, resolvedPath, vnid);
status_t error = dir->GetVolume()->Walk(dir, entryName, resolvedPath, vnid); status_t error = dir->GetVolume()->Walk(dir, entryName, resolvedPath, vnid);
PRINT(("netfs_walk() done: (%lx, `%s', %Ld)\n", error, PRINT("netfs_walk() done: (%lx, `%s', %Ld)\n", error,
(resolvedPath ? *resolvedPath : NULL), *vnid)); (resolvedPath ? *resolvedPath : NULL), *vnid);
return error; return error;
} }
@@ -728,9 +728,9 @@ int
netfs_open_attrdir(void *ns, void *_node, void **cookie) netfs_open_attrdir(void *ns, void *_node, void **cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_open_attrdir(%p, %p)\n", ns, node)); PRINT("netfs_open_attrdir(%p, %p)\n", ns, node);
status_t error = node->GetVolume()->OpenAttrDir(node, cookie); status_t error = node->GetVolume()->OpenAttrDir(node, cookie);
PRINT(("netfs_open_attrdir() done: (%lx, %p)\n", error, *cookie)); PRINT("netfs_open_attrdir() done: (%lx, %p)\n", error, *cookie);
return error; return error;
} }
@@ -740,9 +740,9 @@ int
netfs_close_attrdir(void *ns, void *_node, void *cookie) netfs_close_attrdir(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_close_attrdir(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_close_attrdir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->CloseAttrDir(node, cookie); status_t error = node->GetVolume()->CloseAttrDir(node, cookie);
PRINT(("netfs_close_attrdir() done: (%lx)\n", error)); PRINT("netfs_close_attrdir() done: (%lx)\n", error);
return error; return error;
} }
@@ -752,9 +752,9 @@ int
netfs_free_attrdir_cookie(void *ns, void *_node, void *cookie) netfs_free_attrdir_cookie(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_free_attrdir_cookie(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_free_attrdir_cookie(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->FreeAttrDirCookie(node, cookie); status_t error = node->GetVolume()->FreeAttrDirCookie(node, cookie);
PRINT(("netfs_free_attrdir_cookie() done: (%lx)\n", error)); PRINT("netfs_free_attrdir_cookie() done: (%lx)\n", error);
return error; return error;
} }
@@ -765,11 +765,11 @@ netfs_read_attrdir(void *ns, void *_node, void *cookie, long *count,
struct dirent *buffer, size_t bufferSize) struct dirent *buffer, size_t bufferSize)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_read_attrdir(%p, %p, %p, %ld, %p, %lu)\n", ns, node, PRINT("netfs_read_attrdir(%p, %p, %p, %ld, %p, %lu)\n", ns, node,
cookie, *count, buffer, bufferSize)); cookie, *count, buffer, bufferSize);
status_t error = node->GetVolume()->ReadAttrDir(node, cookie, buffer, status_t error = node->GetVolume()->ReadAttrDir(node, cookie, buffer,
bufferSize, *count, count); bufferSize, *count, count);
PRINT(("netfs_read_attrdir() done: (%lx, %ld)\n", error, *count)); PRINT("netfs_read_attrdir() done: (%lx, %ld)\n", error, *count);
return error; return error;
} }
@@ -779,9 +779,9 @@ int
netfs_rewind_attrdir(void *ns, void *_node, void *cookie) netfs_rewind_attrdir(void *ns, void *_node, void *cookie)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_rewind_attrdir(%p, %p, %p)\n", ns, node, cookie)); PRINT("netfs_rewind_attrdir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->RewindAttrDir(node, cookie); status_t error = node->GetVolume()->RewindAttrDir(node, cookie);
PRINT(("netfs_rewind_attrdir() done: (%lx)\n", error)); PRINT("netfs_rewind_attrdir() done: (%lx)\n", error);
return error; return error;
} }
@@ -792,11 +792,11 @@ netfs_read_attr(void *ns, void *_node, const char *name, int type,
void *buffer, size_t *bufferSize, off_t pos) void *buffer, size_t *bufferSize, off_t pos)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_read_attr(%p, %p, `%s', %d, %p, %lu, %Ld)\n", ns, node, PRINT("netfs_read_attr(%p, %p, `%s', %d, %p, %lu, %Ld)\n", ns, node,
name, type, buffer, *bufferSize, pos)); name, type, buffer, *bufferSize, pos);
status_t error = node->GetVolume()->ReadAttr(node, name, type, pos, buffer, status_t error = node->GetVolume()->ReadAttr(node, name, type, pos, buffer,
*bufferSize, bufferSize); *bufferSize, bufferSize);
PRINT(("netfs_read_attr() done: (%lx, %ld)\n", error, *bufferSize)); PRINT("netfs_read_attr() done: (%lx, %ld)\n", error, *bufferSize);
return error; return error;
} }
@@ -807,11 +807,11 @@ netfs_write_attr(void *ns, void *_node, const char *name, int type,
const void *buffer, size_t *bufferSize, off_t pos) const void *buffer, size_t *bufferSize, off_t pos)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_write_attr(%p, %p, `%s', %d, %p, %lu, %Ld)\n", ns, node, PRINT("netfs_write_attr(%p, %p, `%s', %d, %p, %lu, %Ld)\n", ns, node,
name, type, buffer, *bufferSize, pos)); name, type, buffer, *bufferSize, pos);
status_t error = node->GetVolume()->WriteAttr(node, name, type, pos, buffer, status_t error = node->GetVolume()->WriteAttr(node, name, type, pos, buffer,
*bufferSize, bufferSize); *bufferSize, bufferSize);
PRINT(("netfs_write_attr() done: (%lx, %ld)\n", error, *bufferSize)); PRINT("netfs_write_attr() done: (%lx, %ld)\n", error, *bufferSize);
return error; return error;
} }
@@ -821,9 +821,9 @@ int
netfs_remove_attr(void *ns, void *_node, const char *name) netfs_remove_attr(void *ns, void *_node, const char *name)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_remove_attr(%p, %p, `%s')\n", ns, node, name)); PRINT("netfs_remove_attr(%p, %p, `%s')\n", ns, node, name);
status_t error = node->GetVolume()->RemoveAttr(node, name); status_t error = node->GetVolume()->RemoveAttr(node, name);
PRINT(("netfs_remove_attr() done: (%lx)\n", error)); PRINT("netfs_remove_attr() done: (%lx)\n", error);
return error; return error;
} }
@@ -834,10 +834,10 @@ netfs_rename_attr(void *ns, void *_node, const char *oldName,
const char *newName) const char *newName)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_rename_attr(%p, %p, `%s', `%s')\n", ns, node, oldName, PRINT("netfs_rename_attr(%p, %p, `%s', `%s')\n", ns, node, oldName,
newName)); newName);
status_t error = node->GetVolume()->RenameAttr(node, oldName, newName); status_t error = node->GetVolume()->RenameAttr(node, oldName, newName);
PRINT(("netfs_rename_attr() done: (%lx)\n", error)); PRINT("netfs_rename_attr() done: (%lx)\n", error);
return error; return error;
} }
@@ -848,10 +848,10 @@ netfs_stat_attr(void *ns, void *_node, const char *name,
struct attr_info *attrInfo) struct attr_info *attrInfo)
{ {
Node* node = (Node*)_node; Node* node = (Node*)_node;
PRINT(("netfs_stat_attr(%p, %p, `%s', %p)\n", ns, node, name, PRINT("netfs_stat_attr(%p, %p, `%s', %p)\n", ns, node, name,
attrInfo)); attrInfo);
status_t error = node->GetVolume()->StatAttr(node, name, attrInfo); status_t error = node->GetVolume()->StatAttr(node, name, attrInfo);
PRINT(("netfs_stat_attr() done: (%lx)\n", error)); PRINT("netfs_stat_attr() done: (%lx)\n", error);
return error; return error;
} }
@@ -868,8 +868,8 @@ netfs_open_query(void *ns, const char *queryString, ulong flags,
Volume* volume = volumeManager->GetRootVolume(); Volume* volume = volumeManager->GetRootVolume();
VolumePutter _(volume); VolumePutter _(volume);
PRINT(("netfs_open_query(%p, `%s', %lu, %ld, %ld, %p)\n", ns, PRINT("netfs_open_query(%p, `%s', %lu, %ld, %ld, %p)\n", ns,
queryString, flags, port, token, cookie)); queryString, flags, port, token, cookie);
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) { if (volume) {
@@ -877,7 +877,7 @@ netfs_open_query(void *ns, const char *queryString, ulong flags,
(QueryIterator**)cookie); (QueryIterator**)cookie);
} }
PRINT(("netfs_open_query() done: (%lx, %p)\n", error, *cookie)); PRINT("netfs_open_query() done: (%lx, %p)\n", error, *cookie);
return error; return error;
} }
@@ -886,12 +886,12 @@ static
int int
netfs_close_query(void *ns, void *cookie) netfs_close_query(void *ns, void *cookie)
{ {
PRINT(("netfs_close_query(%p, %p)\n", ns, cookie)); PRINT("netfs_close_query(%p, %p)\n", ns, cookie);
status_t error = B_OK; status_t error = B_OK;
// no-op: we don't use this hook // no-op: we don't use this hook
PRINT(("netfs_close_query() done: (%lx)\n", error)); PRINT("netfs_close_query() done: (%lx)\n", error);
return error; return error;
} }
@@ -903,12 +903,12 @@ netfs_free_query_cookie(void *ns, void *node, void *cookie)
VolumeManager* volumeManager = (VolumeManager*)ns; VolumeManager* volumeManager = (VolumeManager*)ns;
QueryIterator* iterator = (QueryIterator*)cookie; QueryIterator* iterator = (QueryIterator*)cookie;
PRINT(("netfs_free_query_cookie(%p, %p)\n", ns, cookie)); PRINT("netfs_free_query_cookie(%p, %p)\n", ns, cookie);
status_t error = B_OK; status_t error = B_OK;
volumeManager->GetQueryManager()->PutIterator(iterator); volumeManager->GetQueryManager()->PutIterator(iterator);
PRINT(("netfs_free_query_cookie() done: (%lx)\n", error)); PRINT("netfs_free_query_cookie() done: (%lx)\n", error);
return error; return error;
} }
@@ -923,8 +923,8 @@ netfs_read_query(void *ns, void *cookie, long *count,
QueryIterator* iterator = (QueryIterator*)cookie; QueryIterator* iterator = (QueryIterator*)cookie;
VolumePutter _(volume); VolumePutter _(volume);
PRINT(("netfs_read_query(%p, %p, %ld, %p, %lu)\n", ns, cookie, PRINT("netfs_read_query(%p, %p, %ld, %p, %lu)\n", ns, cookie,
*count, buffer, bufferSize)); *count, buffer, bufferSize);
status_t error = B_BAD_VALUE; status_t error = B_BAD_VALUE;
if (volume) { if (volume) {
@@ -932,7 +932,7 @@ netfs_read_query(void *ns, void *cookie, long *count,
*count, count); *count, count);
} }
PRINT(("netfs_read_query() done: (%lx, %ld)\n", error, *count)); PRINT("netfs_read_query() done: (%lx, %ld)\n", error, *count);
return error; return error;
} }
src/add-ons/kernel/file_systems/netfs/server/ClientConnection.cpp
+25 -18
View File
@@ -1612,8 +1612,8 @@ ClientConnection::VisitOpenDirRequest(OpenDirRequest* request)
} }
else { else {
if (directory) if (directory)
PRINT(("OpenDir() failed: client volume: %ld, node: (%ld, %lld)\n", PRINT("OpenDir() failed: client volume: %ld, node: (%ld, %lld)\n",
volume->GetID(), directory->GetVolumeID(), directory->GetID())); volume->GetID(), directory->GetVolumeID(), directory->GetID());
} }
managerLocker.Unlock(); managerLocker.Unlock();
@@ -1679,7 +1679,7 @@ ClientConnection::VisitReadDirRequest(ReadDirRequest* request)
} }
if (result == B_OK) { if (result == B_OK) {
PRINT(("ReadDir: (%ld, %lld)\n", request->volumeID, directory->GetID())); PRINT("ReadDir: (%ld, %lld)\n", request->volumeID, directory->GetID());
} }
// rewind, if requested // rewind, if requested
@@ -1713,9 +1713,9 @@ PRINT(("ReadDir: (%ld, %lld)\n", request->volumeID, directory->GetID()));
//reply.entryInfo.directoryID, //reply.entryInfo.directoryID,
//reply.entryInfo.nodeID, reply.entryInfo.name.GetString())); //reply.entryInfo.nodeID, reply.entryInfo.name.GetString()));
if (directory) { if (directory) {
PRINT(("ReadDir done: volume: %ld, (%ld, %lld) -> (%lx, %ld)\n", PRINT("ReadDir done: volume: %ld, (%ld, %lld) -> (%lx, %ld)\n",
volume->GetID(), directory->GetVolumeID(), directory->GetID(), result, volume->GetID(), directory->GetVolumeID(), directory->GetID(), result,
reply.entryInfos.CountElements())); reply.entryInfos.CountElements());
} }
managerLocker.Unlock(); managerLocker.Unlock();
@@ -1789,10 +1789,11 @@ ClientConnection::VisitWalkRequest(WalkRequest* request)
// send the reply // send the reply
reply.error = result; reply.error = result;
PRINT(("Walk: (%ld, %lld, `%s') -> (%lx, (%ld, %lld), `%s')\n", PRINT("Walk: (%ld, %lld, `%s') -> (%lx, (%ld, %lld), `%s')\n",
request->nodeID.volumeID, request->nodeID.nodeID, request->name.GetString(), request->nodeID.volumeID, request->nodeID.nodeID,
result, reply.entryInfo.nodeInfo.st.st_dev, reply.entryInfo.nodeInfo.st.st_ino, request->name.GetString(), result,
reply.linkPath.GetString())); reply.entryInfo.nodeInfo.st.st_dev,
reply.entryInfo.nodeInfo.st.st_ino, reply.linkPath.GetString());
return GetChannel()->SendRequest(&reply); return GetChannel()->SendRequest(&reply);
} }
@@ -1854,9 +1855,9 @@ ClientConnection::VisitMultiWalkRequest(MultiWalkRequest* request)
// send the reply // send the reply
reply.error = result; reply.error = result;
PRINT(("MultiWalk: (%ld, %lld, %ld) -> (%lx, %ld)\n", PRINT("MultiWalk: (%ld, %lld, %ld) -> (%lx, %ld)\n",
request->nodeID.volumeID, request->nodeID.nodeID, count, request->nodeID.volumeID, request->nodeID.nodeID, count,
result, reply.entryInfos.CountElements())); result, reply.entryInfos.CountElements());
return GetChannel()->SendRequest(&reply); return GetChannel()->SendRequest(&reply);
} }
@@ -2434,7 +2435,8 @@ ClientConnection::VisitReadQueryRequest(ReadQueryRequest* request)
break; break;
if (countRead == 0) if (countRead == 0)
break; break;
PRINT((" query entry: %ld, %lld, \"%s\"\n", dirEntry->d_pdev, dirEntry->d_pino, dirEntry->d_name)); PRINT(" query entry: %ld, %lld, \"%s\"\n",
dirEntry->d_pdev, dirEntry->d_pino, dirEntry->d_name);
VolumeManagerLocker managerLocker; VolumeManagerLocker managerLocker;
VolumeManager* volumeManager = VolumeManager::GetDefault(); VolumeManager* volumeManager = VolumeManager::GetDefault();
@@ -2473,10 +2475,13 @@ PRINT((" -> no client volumes\n"));
// send the reply // send the reply
reply.error = result; reply.error = result;
reply.count = countRead; reply.count = countRead;
PRINT(("ReadQuery: (%lx, %ld, dir: (%ld, %lld), node: (%ld, %lld, `%s')\n", PRINT("ReadQuery: (%lx, %ld, dir: (%ld, %lld), node: (%ld, %lld, `%s')"
reply.error, reply.count, reply.entryInfo.directoryID.volumeID, "\n", reply.error, reply.count,
reply.entryInfo.directoryID.nodeID, reply.entryInfo.nodeInfo.st.st_dev, reply.entryInfo.directoryID.volumeID,
reply.entryInfo.nodeInfo.st.st_ino, reply.entryInfo.name.GetString())); reply.entryInfo.directoryID.nodeID,
reply.entryInfo.nodeInfo.st.st_dev,
reply.entryInfo.nodeInfo.st.st_ino,
reply.entryInfo.name.GetString());
return GetChannel()->SendRequest(&reply); return GetChannel()->SendRequest(&reply);
} }
@@ -2570,7 +2575,9 @@ ClientConnection::ProcessQueryEvent(NodeMonitoringEvent* event)
event->opcode); event->opcode);
return; return;
} }
PRINT(("ClientConnection::ProcessQueryEvent(): event: %p, type: %s: directory: (%ld, %lld)\n", event, typeid(event).name(), volumeID, directoryID)); PRINT("ClientConnection::ProcessQueryEvent(): event: %p, type: %s:"
" directory: (%ld, %lld)\n", event, typeid(event).name(),
volumeID, directoryID);
// create an array for the IDs of the client volumes a found entry may // create an array for the IDs of the client volumes a found entry may
// reside on // reside on
src/add-ons/kernel/file_systems/netfs/server/NetFSServer.cpp
+1 -1
View File
@@ -764,7 +764,7 @@ NetFSServer::_AddClientConnection(ClientConnection* clientConnection)
void void
NetFSServer::ClientConnectionClosed(ClientConnection* connection, bool broken) NetFSServer::ClientConnectionClosed(ClientConnection* connection, bool broken)
{ {
PRINT(("NetFSServer::ClientConnectionClosed(%d)\n", broken)); PRINT("NetFSServer::ClientConnectionClosed(%d)\n", broken);
if (!connection) if (!connection)
return; return;
AutoLocker<Locker> locker(fLock); AutoLocker<Locker> locker(fLock);
src/add-ons/kernel/file_systems/netfs/server/NodeMonitor.cpp
+4 -4
View File
@@ -102,8 +102,8 @@ NodeMonitor::StartWatching(const node_ref& ref)
error = watch_node(&ref, flags, this); error = watch_node(&ref, flags, this);
} }
if (error == B_OK) { if (error == B_OK) {
PRINT(("NodeMonitor: started watching node: (%ld, %lld)\n", ref.device, PRINT("NodeMonitor: started watching node: (%ld, %lld)\n", ref.device,
ref.node)); ref.node);
} }
return error; return error;
} }
@@ -112,8 +112,8 @@ ref.node));
status_t status_t
NodeMonitor::StopWatching(const node_ref& ref) NodeMonitor::StopWatching(const node_ref& ref)
{ {
PRINT(("NodeMonitor: stopped watching node: (%ld, %lld)\n", ref.device, PRINT("NodeMonitor: stopped watching node: (%ld, %lld)\n", ref.device,
ref.node)); ref.node);
return watch_node(&ref, B_STOP_WATCHING, this); return watch_node(&ref, B_STOP_WATCHING, this);
} }
src/add-ons/kernel/file_systems/netfs/server/VolumeManager.cpp
+8 -6
View File
@@ -719,8 +719,8 @@ VolumeManager::LoadEntry(dev_t volumeID, ino_t directoryID, const char* name,
Entry* entry = GetEntry(volumeID, directoryID, name); Entry* entry = GetEntry(volumeID, directoryID, name);
if (!entry) { if (!entry) {
// entry not known yet: create it // entry not known yet: create it
PRINT(("VolumeManager::LoadEntry(%ld, %lld, `%s')\n", volumeID, directoryID, PRINT("VolumeManager::LoadEntry(%ld, %lld, `%s')\n", volumeID,
name)); directoryID, name);
// get the volume // get the volume
Volume* volume = GetVolume(volumeID, true); Volume* volume = GetVolume(volumeID, true);
@@ -791,7 +791,8 @@ VolumeManager::OpenQuery(QueryDomain* queryDomain, const char* queryString,
if (!queryDomain || !queryString || !handle) if (!queryDomain || !queryString || !handle)
return B_BAD_VALUE; return B_BAD_VALUE;
bool liveQuery = (flags & B_LIVE_QUERY); bool liveQuery = (flags & B_LIVE_QUERY);
PRINT(("VolumeManager::OpenQuery(%p, \"%s\", 0x%lx, %ld, %ld)\n", queryDomain, queryString, flags, remotePort, remoteToken)); PRINT("VolumeManager::OpenQuery(%p, \"%s\", 0x%lx, %ld, %ld)\n",
queryDomain, queryString, flags, remotePort, remoteToken);
// allocate the handle // allocate the handle
QueryHandle* queryHandle = new(std::nothrow) QueryHandle(remotePort, QueryHandle* queryHandle = new(std::nothrow) QueryHandle(remotePort,
@@ -826,7 +827,8 @@ PRINT(("VolumeManager::OpenQuery(%p, \"%s\", 0x%lx, %ld, %ld)\n", queryDomain, q
// branches of the FS tree and don't have common nodes. // branches of the FS tree and don't have common nodes.
if (!queryDomain->QueryDomainIntersectsWith(volume)) if (!queryDomain->QueryDomainIntersectsWith(volume))
continue; continue;
PRINT(("VolumeManager::OpenQuery(): adding Query for volume %ld\n", volume->GetID())); PRINT("VolumeManager::OpenQuery(): adding Query for volume %ld"
"\n", volume->GetID());
// create the query for this volume // create the query for this volume
BVolume bVolume(volume->GetID()); BVolume bVolume(volume->GetID());
@@ -1708,8 +1710,8 @@ VolumeManager::_CheckVolumeRootMoved(EntryMovedEvent* event)
event->nodeID = st.st_ino; event->nodeID = st.st_ino;
if (Volume* volume = GetVolume(st.st_dev)) { if (Volume* volume = GetVolume(st.st_dev)) {
if (volume->GetRootID() == st.st_ino) { if (volume->GetRootID() == st.st_ino) {
PRINT(("Mount point for volume %ld renamed\n", PRINT("Mount point for volume %ld renamed\n",
volume->GetID())); volume->GetID());
} }
} }
} }
src/add-ons/kernel/file_systems/netfs/shared/InsecureConnection.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ PRINT(("InsecureConnection::Init\n"));
// open the remaining channels // open the remaining channels
int32 allChannels = upStreamChannels + downStreamChannels; int32 allChannels = upStreamChannels + downStreamChannels;
for (int32 i = 1; i < allChannels; i++) { for (int32 i = 1; i < allChannels; i++) {
PRINT((" creating channel %ld\n", i)); PRINT(" creating channel %ld\n", i);
// open the channel // open the channel
error = _OpenClientChannel(serverAddr, port, &channel); error = _OpenClientChannel(serverAddr, port, &channel);
if (error != B_OK) if (error != B_OK)
@@ -292,7 +292,7 @@ PRINT(("InsecureConnection::FinishInitialization()\n"));
} }
RETURN_ERROR(error); RETURN_ERROR(error);
} }
PRINT((" accepting channel %ld\n", i)); PRINT(" accepting channel %ld\n", i);
// create a channel // create a channel
channel = new(std::nothrow) InsecureChannel(channelFD); channel = new(std::nothrow) InsecureChannel(channelFD);
if (!channel) { if (!channel) {
src/add-ons/kernel/file_systems/netfs/shared/RequestChannel.cpp
+2 -2
View File
@@ -161,7 +161,7 @@ RequestChannel::SendRequest(Request* request)
{ {
if (!request) if (!request)
RETURN_ERROR(B_BAD_VALUE); RETURN_ERROR(B_BAD_VALUE);
PRINT(("%p->RequestChannel::SendRequest(): request: %p, type: %s\n", this, request, typeid(*request).name())); PRINT("%p->RequestChannel::SendRequest(): request: %p, type: %s\n", this, request, typeid(*request).name());
// get request size // get request size
int32 size; int32 size;
@@ -245,7 +245,7 @@ RequestChannel::ReceiveRequest(Request** _request)
requestDeleter.Detach(); requestDeleter.Detach();
*_request = request; *_request = request;
PRINT(("%p->RequestChannel::ReceiveRequest(): request: %p, type: %s\n", this, request, typeid(*request).name())); PRINT("%p->RequestChannel::ReceiveRequest(): request: %p, type: %s\n", this, request, typeid(*request).name());
return B_OK; return B_OK;
} }
src/add-ons/kernel/file_systems/netfs/shared/RequestDumper.cpp
+16 -16
View File
@@ -24,7 +24,7 @@ RequestDumper::RequestDumper()
void void
RequestDumper::DumpRequest(Request* request) RequestDumper::DumpRequest(Request* request)
{ {
PRINT(("request: %s\n", typeid(*request).name())); PRINT("request: %s\n", typeid(*request).name());
fIndentationLevel++; fIndentationLevel++;
request->ShowAround(this); request->ShowAround(this);
fIndentationLevel--; fIndentationLevel--;
@@ -34,86 +34,86 @@ RequestDumper::DumpRequest(Request* request)
void void
RequestDumper::Visit(RequestMember* member, bool& data) RequestDumper::Visit(RequestMember* member, bool& data)
{ {
PRINT(("%sbool: %s\n", _Indentation(), (data ? "true" : "false"))); PRINT("%sbool: %s\n", _Indentation(), (data ? "true" : "false"));
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, int8& data) RequestDumper::Visit(RequestMember* member, int8& data)
{ {
PRINT(("%sint8: %d\n", _Indentation(), (int)data)); PRINT("%sint8: %d\n", _Indentation(), (int)data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, uint8& data) RequestDumper::Visit(RequestMember* member, uint8& data)
{ {
PRINT(("%suint8: %d\n", _Indentation(), (int)data)); PRINT("%suint8: %d\n", _Indentation(), (int)data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, int16& data) RequestDumper::Visit(RequestMember* member, int16& data)
{ {
PRINT(("%sint16: %d\n", _Indentation(), (int)data)); PRINT("%sint16: %d\n", _Indentation(), (int)data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, uint16& data) RequestDumper::Visit(RequestMember* member, uint16& data)
{ {
PRINT(("%suint16: %d\n", _Indentation(), (int)data)); PRINT("%suint16: %d\n", _Indentation(), (int)data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, int32& data) RequestDumper::Visit(RequestMember* member, int32& data)
{ {
PRINT(("%sint32: %ld\n", _Indentation(), data)); PRINT("%sint32: %ld\n", _Indentation(), data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, uint32& data) RequestDumper::Visit(RequestMember* member, uint32& data)
{ {
PRINT(("%suint32: %lu\n", _Indentation(), data)); PRINT("%suint32: %lu\n", _Indentation(), data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, int64& data) RequestDumper::Visit(RequestMember* member, int64& data)
{ {
PRINT(("%sint64: %lld\n", _Indentation(), data)); PRINT("%sint64: %lld\n", _Indentation(), data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, uint64& data) RequestDumper::Visit(RequestMember* member, uint64& data)
{ {
PRINT(("%suint64: %llu\n", _Indentation(), data)); PRINT("%suint64: %llu\n", _Indentation(), data);
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, Data& data) RequestDumper::Visit(RequestMember* member, Data& data)
{ {
PRINT(("%sdata: %p (%ld bytes)\n", _Indentation(), data.GetData(), PRINT("%sdata: %p (%ld bytes)\n", _Indentation(), data.GetData(),
data.GetSize())); data.GetSize());
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, StringData& data) RequestDumper::Visit(RequestMember* member, StringData& data)
{ {
PRINT(("%sstring: \"%s\" (%p, %ld bytes)\n", _Indentation(), PRINT("%sstring: \"%s\" (%p, %ld bytes)\n", _Indentation(),
data.GetString(), data.GetString(), data.GetSize())); data.GetString(), data.GetString(), data.GetSize());
} }
// Visit // Visit
void void
RequestDumper::Visit(RequestMember* member, RequestMember& subMember) RequestDumper::Visit(RequestMember* member, RequestMember& subMember)
{ {
PRINT(("%ssubmember:\n", _Indentation())); PRINT("%ssubmember:\n", _Indentation());
fIndentationLevel++; fIndentationLevel++;
subMember.ShowAround(this); subMember.ShowAround(this);
@@ -125,7 +125,7 @@ void
RequestDumper::Visit(RequestMember* member, RequestDumper::Visit(RequestMember* member,
FlattenableRequestMember& subMember) FlattenableRequestMember& subMember)
{ {
PRINT(("%sflattenable: %s\n", _Indentation(), typeid(subMember).name())); PRINT("%sflattenable: %s\n", _Indentation(), typeid(subMember).name());
} }
// _Indentation // _Indentation