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

netfs: debug build and 64bit fixes.

Browse Source
This commit is contained in:
Jérôme Duval
2014-12-21 15:10:46 +01:00
parent 8de3277334
commit 4cfa5b2dd6
6 changed files with 96 additions and 84 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/add-ons/kernel/file_systems/netfs/client/ServerManager.cpp
+2 -2
View File
@@ -323,8 +323,8 @@ ServerManager::_BroadcastListener()
if (message.protocolVersion
!= (int32)B_HOST_TO_BENDIAN_INT32(NETFS_PROTOCOL_VERSION)) {
PRINT("ServerManager::_BroadcastListener(): protocol "
"version does not match: %lu vs. %d.\n",
B_BENDIAN_TO_HOST_INT32(
"version does not match: %" B_PRId32 " vs. %d.\n",
(int32)B_BENDIAN_TO_HOST_INT32(
message.protocolVersion),
NETFS_PROTOCOL_VERSION);
continue;
src/add-ons/kernel/file_systems/netfs/client/ShareVolume.cpp
+23 -22
View File
@@ -353,7 +353,7 @@ PRINT(("ShareVolume::PrepareToUnmount()\n"));
int32 count = fNodes->Size();
if (count == 0)
return;
PRINT(" %ld nodes to remove\n", count);
PRINT(" %" B_PRId32 " nodes to remove\n", count);
vnode_id* ids = new(std::nothrow) vnode_id[count];
if (!ids) {
ERROR("ShareVolume::PrepareToUnmount(): ERROR: Insufficient memory to "
@@ -395,7 +395,7 @@ PRINT(("ShareVolume::PrepareToUnmount()\n"));
for (int32 i = 0; i < count; i++) {
Node* node;
if (GetVNode(ids[i], &node) == B_OK) {
PRINT(" removing node %lld\n", ids[i]);
PRINT(" removing node %" B_PRIdINO "\n", ids[i]);
Volume::RemoveVNode(ids[i]);
PutVNode(ids[i]);
}
@@ -1166,8 +1166,8 @@ ShareVolume::OpenDir(Node* _node, void** _cookie)
ObjectDeleter<Request> replyDeleter(reply);
if (reply->error != B_OK)
{
PRINT("OpenDir() failed: node: %lld, remote: (%ld, %lld)\n",
node->GetID(), node->GetRemoteID().volumeID,
PRINT("OpenDir() failed: node: %" B_PRIdINO ", remote: (%" B_PRIdDEV
", %" B_PRIdINO ")\n", node->GetID(), node->GetRemoteID().volumeID,
node->GetRemoteID().nodeID);
RETURN_ERROR(reply->error);
}
@@ -2018,10 +2018,10 @@ ShareVolume::GetQueryEntry(const EntryInfo& entryInfo,
buffer->d_ino = localNodeID;
*countRead = 1;
PRINT(" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld, d_pino: %Ld, "
"d_reclen: %hu, d_name: `%s'\n", buffer->d_dev, buffer->d_pdev,
buffer->d_ino, buffer->d_pino, buffer->d_reclen,
buffer->d_name);
PRINT(" entry: d_dev: %" B_PRIdDEV ", d_pdev: %" B_PRIdDEV ", d_ino: %"
B_PRIdINO ", d_pino: %" B_PRIdINO ", d_reclen: %hu, d_name: `%s'\n",
buffer->d_dev, buffer->d_pdev, buffer->d_ino, buffer->d_pino,
buffer->d_reclen, buffer->d_name);
return B_OK;
}
@@ -2172,11 +2172,11 @@ ShareVolume::_HandleEntryCreatedRequest(EntryCreatedRequest* request)
status_t error = _GetLocalNodeID(request->directoryID, &vnida, true);
if (error == B_OK)
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,
PRINT("ShareVolume::_HandleEntryCreatedRequest(): error: 0x%" B_PRIx32
", name: \"%s\", dir: %" B_PRIdINO " (remote: (%" B_PRIdDEV ", %"
B_PRIdINO ")), node: %" B_PRIdINO " (remote: (%" B_PRIdDEV ", %"
B_PRIdINO "))\n", error, name, vnida,
request->directoryID.volumeID, request->directoryID.nodeID, vnidc,
request->nodeID.volumeID, request->nodeID.nodeID);
// send notifications / do additional processing
@@ -2369,9 +2369,9 @@ ShareVolume::_GetLocalNodeID(NodeID remoteID, ino_t* _localID, bool enter)
fVolumeManager->RemoveNodeID(localID);
return error;
}
PRINT("ShareVolume(%ld): added node ID mapping: local: %lld -> "
"remote: (%ld, %lld)\n", fID, localID, remoteID.volumeID,
remoteID.nodeID);
PRINT("ShareVolume(%" B_PRId32 "): added node ID mapping: local: %"
B_PRIdINO " -> remote: (%" B_PRIdDEV ", %" B_PRIdINO ")\n", fID,
localID, remoteID.volumeID, remoteID.nodeID);
*_localID = localID;
return B_OK;
@@ -2403,8 +2403,9 @@ ShareVolume::_RemoveLocalNodeID(ino_t localID)
// remove from ID maps
NodeID remoteID = fRemoteNodeIDs->Get(localID);
PRINT("ShareVolume::_RemoveLocalNodeID(%lld): remote: (%ld, %lld)\n",
localID, remoteID.volumeID, remoteID.nodeID);
PRINT("ShareVolume::_RemoveLocalNodeID(%" B_PRIdINO "): remote: (%"
B_PRIdDEV ", %" B_PRIdINO ")\n", localID, remoteID.volumeID,
remoteID.nodeID);
fRemoteNodeIDs->Remove(localID);
fLocalNodeIDs->Remove(remoteID);
@@ -2471,8 +2472,8 @@ ShareVolume::_LoadNode(const NodeInfo& nodeInfo, ShareNode** _node)
delete node;
return error;
}
PRINT("ShareVolume: added node: %lld: remote: (%ld, %lld),"
" localID: %lld\n", node->GetID(),
PRINT("ShareVolume: added node: %" B_PRIdINO ": remote: (%" B_PRIdDEV
", %" B_PRIdINO "), localID: %" B_PRIdINO "\n", node->GetID(),
node->GetRemoteID().volumeID,
node->GetRemoteID().nodeID, localID);
}
@@ -3103,8 +3104,8 @@ ShareVolume::_MountShare()
fLocalNodeIDs->Remove(fRootNode->GetRemoteID());
RETURN_ERROR(error);
}
PRINT("ShareVolume::_MountShare(): root node: local: %lld, remote: "
"(%ld, %lld)\n", fRootNode->GetID(),
PRINT("ShareVolume::_MountShare(): root node: local: %" B_PRIdINO
", remote: (%" B_PRIdDEV ", %" B_PRIdINO ")\n", fRootNode->GetID(),
fRootNode->GetRemoteID().volumeID,
fRootNode->GetRemoteID().nodeID);
src/add-ons/kernel/file_systems/netfs/client/VirtualVolume.cpp
+1 -1
View File
@@ -240,7 +240,7 @@ VirtualVolume::GetUniqueEntryName(const char* baseName, char* buffer)
while (fRootNode->GetChildNode(baseName)) {
// create a suffix
char suffix[13];
sprintf(suffix, " %ld", suffixNumber);
sprintf(suffix, " %" B_PRId32, suffixNumber);
suffixNumber++;
// check the len
src/add-ons/kernel/file_systems/netfs/client/Volume.cpp
+4 -3
View File
@@ -172,9 +172,10 @@ Volume::SendNotification(port_id port, int32 token, uint32 what, int32 op,
nspace_id nsida, nspace_id nsidb, vnode_id vnida, vnode_id vnidb,
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(%" B_PRId32 ", %" B_PRId32 ", 0x%" B_PRIx32
", 0x%" B_PRIx32 ", %" B_PRId32 ", %" B_PRId32 ", %" B_PRIdINO ","
" %" B_PRIdINO ", %" B_PRIdINO ", \"%s\")\n", port, token, what, op,
nsida, nsidb, vnida, vnidb, vnidc, name);
return send_notification(port, token, what, op, nsida, nsidb, vnida,
vnidb, vnidc, name);
}
src/add-ons/kernel/file_systems/netfs/client/VolumeManager.cpp
+5
View File
@@ -11,8 +11,13 @@
#include "VolumeManager.h"
// VolumeSet
#ifdef B_HAIKU_64_BIT
struct VolumeManager::VolumeSet : HashSet<HashKey64<Volume*> > {
};
#else
struct VolumeManager::VolumeSet : HashSet<HashKey32<Volume*> > {
};
#endif
// NodeIDVolumeMap
struct VolumeManager::NodeIDVolumeMap : HashMap<HashKey64<vnode_id>, Volume*> {
src/add-ons/kernel/file_systems/netfs/client/netfs.cpp
+61 -56
View File
@@ -256,7 +256,7 @@ netfs_sync(void *ns)
if (volume)
error = volume->Sync();
PRINT("netfs_sync() done: %lx \n", error);
PRINT("netfs_sync() done: %" B_PRIx32 " \n", error);
return error;
}
@@ -278,7 +278,7 @@ netfs_read_fs_stat(void *ns, struct fs_info *info)
if (volume)
error = volume->ReadFSStat(info);
PRINT("netfs_read_fs_stat() done: %lx \n", error);
PRINT("netfs_read_fs_stat() done: %" B_PRIx32 " \n", error);
return error;
}
@@ -300,7 +300,7 @@ netfs_write_fs_stat(void *ns, struct fs_info *info, long mask)
if (volume)
error = volume->WriteFSStat(info, mask);
PRINT("netfs_write_fs_stat() done: %lx \n", error);
PRINT("netfs_write_fs_stat() done: %" B_PRIx32 " \n", error);
return error;
}
@@ -319,13 +319,14 @@ netfs_read_vnode(void *ns, vnode_id vnid, char reenter, void **node)
Volume* volume = volumeManager->GetVolume(vnid);
VolumePutter _(volume);
PRINT("netfs_read_vnode(%p, %Ld, %d, %p)\n", ns, vnid, reenter, node);
PRINT("netfs_read_vnode(%p, %" B_PRIdINO ", %d, %p)\n", ns, vnid, reenter,
node);
status_t error = B_BAD_VALUE;
if (volume)
error = volume->ReadVNode(vnid, reenter, (Node**)node);
PRINT("netfs_read_vnode() done: (%lx, %p)\n", error, *node);
PRINT("netfs_read_vnode() done: (%" B_PRIx32 ", %p)\n", error, *node);
return error;
}
@@ -343,7 +344,7 @@ netfs_write_vnode(void *ns, void *_node, char reenter)
// invoke this hook.
// PRINT(("netfs_write_vnode(%p, %p, %d)\n", ns, node, reenter));
status_t error = node->GetVolume()->WriteVNode(node, reenter);
// PRINT(("netfs_write_vnode() done: %lx\n", error));
// PRINT(("netfs_write_vnode() done: %" B_PRIx32 "\n", error));
return error;
}
@@ -356,7 +357,7 @@ netfs_remove_vnode(void *ns, void *_node, char reenter)
// DANGER: See netfs_write_vnode().
// PRINT(("netfs_remove_vnode(%p, %p, %d)\n", ns, node, reenter));
status_t error = node->GetVolume()->RemoveVNode(node, reenter);
// PRINT(("netfs_remove_vnode() done: %lx\n", error));
// PRINT(("netfs_remove_vnode() done: %" B_PRIx32 "\n", error));
return error;
}
@@ -373,7 +374,7 @@ netfs_fsync(void *ns, void *_node)
Node* node = (Node*)_node;
PRINT("netfs_fsync(%p, %p)\n", ns, node);
status_t error = node->GetVolume()->FSync(node);
PRINT("netfs_fsync() done: %lx\n", error);
PRINT("netfs_fsync() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -387,7 +388,7 @@ netfs_read_stat(void *ns, void *_node, struct stat *st)
Node* node = (Node*)_node;
PRINT("netfs_read_stat(%p, %p, %p)\n", ns, node, st);
status_t error = node->GetVolume()->ReadStat(node, st);
PRINT("netfs_read_stat() done: %lx\n", error);
PRINT("netfs_read_stat() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -399,7 +400,7 @@ netfs_write_stat(void *ns, void *_node, struct stat *st, long mask)
Node* node = (Node*)_node;
PRINT("netfs_write_stat(%p, %p, %p, %ld)\n", ns, 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: %" B_PRIx32 "\n", error);
return error;
}
@@ -411,7 +412,7 @@ netfs_access(void *ns, void *_node, int mode)
Node* node = (Node*)_node;
PRINT("netfs_access(%p, %p, %d)\n", ns, node, mode);
status_t error = node->GetVolume()->Access(node, mode);
PRINT("netfs_access() done: %lx\n", error);
PRINT("netfs_access() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -429,7 +430,7 @@ netfs_create(void *ns, void *_dir, const char *name, int openMode, int mode,
name, openMode, mode, vnid, cookie);
status_t error = dir->GetVolume()->Create(dir, name, openMode, mode, vnid,
cookie);
PRINT("netfs_create() done: (%lx, %Ld, %p)\n", error, *vnid,
PRINT("netfs_create() done: (%" B_PRIx32 ", %" B_PRIdINO ", %p)\n", error, *vnid,
*cookie);
return error;
}
@@ -442,7 +443,7 @@ netfs_open(void *ns, void *_node, int openMode, void **cookie)
Node* node = (Node*)_node;
PRINT("netfs_open(%p, %p, %d)\n", ns, node, openMode);
status_t error = node->GetVolume()->Open(node, openMode, cookie);
PRINT("netfs_open() done: (%lx, %p)\n", error, *cookie);
PRINT("netfs_open() done: (%" B_PRIx32 ", %p)\n", error, *cookie);
return error;
}
@@ -454,7 +455,7 @@ netfs_close(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_close(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->Close(node, cookie);
PRINT("netfs_close() done: %lx\n", error);
PRINT("netfs_close() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -466,7 +467,7 @@ netfs_free_cookie(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_free_cookie(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->FreeCookie(node, cookie);
PRINT("netfs_free_cookie() done: %lx\n", error);
PRINT("netfs_free_cookie() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -477,11 +478,11 @@ netfs_read(void *ns, void *_node, void *cookie, off_t pos, void *buffer,
size_t *bufferSize)
{
Node* node = (Node*)_node;
PRINT("netfs_read(%p, %p, %p, %Ld, %p, %lu)\n", ns, node, cookie, pos,
buffer, *bufferSize);
PRINT("netfs_read(%p, %p, %p, %" B_PRIdOFF ", %p, %lu)\n", ns, node,
cookie, pos, buffer, *bufferSize);
status_t error = node->GetVolume()->Read(node, cookie, pos, buffer,
*bufferSize, bufferSize);
PRINT("netfs_read() done: (%lx, %lu)\n", error, *bufferSize);
PRINT("netfs_read() done: (%" B_PRIx32 ", %lu)\n", error, *bufferSize);
return error;
}
@@ -492,11 +493,11 @@ netfs_write(void *ns, void *_node, void *cookie, off_t pos,
const void *buffer, size_t *bufferSize)
{
Node* node = (Node*)_node;
PRINT("netfs_write(%p, %p, %p, %Ld, %p, %lu)\n", ns, node, cookie, pos,
buffer, *bufferSize);
PRINT("netfs_write(%p, %p, %p, %" B_PRIdOFF ", %p, %lu)\n", ns, node,
cookie, pos, buffer, *bufferSize);
status_t error = node->GetVolume()->Write(node, cookie, pos, buffer,
*bufferSize, bufferSize);
PRINT("netfs_write() done: (%lx, %lu)\n", error, *bufferSize);
PRINT("netfs_write() done: (%" B_PRIx32 ", %lu)\n", error, *bufferSize);
return error;
}
@@ -511,7 +512,7 @@ netfs_ioctl(void *ns, void *_node, void *cookie, int cmd, void *buffer,
buffer, bufferSize);
status_t error = node->GetVolume()->IOCtl(node, cookie, cmd, buffer,
bufferSize);
PRINT("netfs_ioctl() done: (%lx)\n", error);
PRINT("netfs_ioctl() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -539,7 +540,7 @@ netfs_link(void *ns, void *_dir, const char *name, void *_node)
Node* node = (Node*)_node;
PRINT("netfs_link(%p, %p, `%s', %p)\n", ns, dir, name, node);
status_t error = dir->GetVolume()->Link(dir, name, node);
PRINT("netfs_link() done: (%lx)\n", error);
PRINT("netfs_link() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -551,7 +552,7 @@ netfs_unlink(void *ns, void *_dir, const char *name)
Node* dir = (Node*)_dir;
PRINT("netfs_unlink(%p, %p, `%s')\n", ns, dir, name);
status_t error = dir->GetVolume()->Unlink(dir, name);
PRINT("netfs_unlink() done: (%lx)\n", error);
PRINT("netfs_unlink() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -563,7 +564,7 @@ netfs_symlink(void *ns, void *_dir, const char *name, const char *path)
Node* dir = (Node*)_dir;
PRINT("netfs_symlink(%p, %p, `%s', `%s')\n", ns, dir, name, path);
status_t error = dir->GetVolume()->Symlink(dir, name, path);
PRINT("netfs_symlink() done: (%lx)\n", error);
PRINT("netfs_symlink() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -577,7 +578,8 @@ netfs_read_link(void *ns, void *_node, char *buffer, size_t *bufferSize)
*bufferSize);
status_t error = node->GetVolume()->ReadLink(node, buffer, *bufferSize,
bufferSize);
PRINT("netfs_read_link() done: (%lx, %lu)\n", error, *bufferSize);
PRINT("netfs_read_link() done: (%" B_PRIx32 ", %lu)\n", error,
*bufferSize);
return error;
}
@@ -593,7 +595,7 @@ netfs_rename(void *ns, void *_oldDir, const char *oldName, void *_newDir,
newDir, newName);
status_t error = oldDir->GetVolume()->Rename(oldDir, oldName,
newDir, newName);
PRINT("netfs_rename() done: (%lx)\n", error);
PRINT("netfs_rename() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -608,7 +610,7 @@ netfs_mkdir(void *ns, void *_dir, const char *name, int mode)
Node* dir = (Node*)_dir;
PRINT("netfs_mkdir(%p, %p, `%s', %d)\n", ns, dir, name, mode);
status_t error = dir->GetVolume()->MkDir(dir, name, mode);
PRINT("netfs_mkdir() done: (%lx)\n", error);
PRINT("netfs_mkdir() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -620,7 +622,7 @@ netfs_rmdir(void *ns, void *_dir, const char *name)
Node* dir = (Node*)_dir;
PRINT("netfs_rmdir(%p, %p, `%s')\n", ns, dir, name);
status_t error = dir->GetVolume()->RmDir(dir, name);
PRINT("netfs_rmdir() done: (%lx)\n", error);
PRINT("netfs_rmdir() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -632,7 +634,7 @@ netfs_open_dir(void *ns, void *_node, void **cookie)
Node* node = (Node*)_node;
PRINT("netfs_open_dir(%p, %p)\n", ns, node);
status_t error = node->GetVolume()->OpenDir(node, cookie);
PRINT("netfs_open_dir() done: (%lx, %p)\n", error, *cookie);
PRINT("netfs_open_dir() done: (%" B_PRIx32 ", %p)\n", error, *cookie);
return error;
}
@@ -644,7 +646,7 @@ netfs_close_dir(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_close_dir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->CloseDir(node, cookie);
PRINT("netfs_close_dir() done: %lx\n", error);
PRINT("netfs_close_dir() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -656,7 +658,7 @@ netfs_free_dir_cookie(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_free_dir_cookie(%p, %p, %p)\n", ns, 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: %" B_PRIx32 " \n", error);
return error;
}
@@ -673,7 +675,7 @@ netfs_read_dir(void *ns, void *_node, void *cookie, long *count,
status_t error = node->GetVolume()->ReadDir(node, cookie, buffer,
bufferSize, _count, &_count);
*count = _count;
PRINT("netfs_read_dir() done: (%lx, %ld)\n", error, *count);
PRINT("netfs_read_dir() done: (%" B_PRIx32 ", %ld)\n", error, *count);
#if DEBUG
dirent* entry = buffer;
for (int32 i = 0; i < *count; i++) {
@@ -683,8 +685,9 @@ netfs_read_dir(void *ns, void *_node, void *cookie, long *count,
int nameLen = strnlen(entry->d_name, B_FILE_NAME_LENGTH - 1);
strncpy(name, entry->d_name, nameLen);
name[nameLen] = '\0';
PRINT(" entry: d_dev: %ld, d_pdev: %ld, d_ino: %Ld,"
" d_pino: %Ld, d_reclen: %hu, d_name: `%s'\n",
PRINT(" entry: d_dev: %" B_PRIdDEV ", d_pdev: %" B_PRIdDEV
", d_ino: %" B_PRIdINO ", d_pino: %" B_PRIdINO
", d_reclen: %hu, d_name: `%s'\n",
entry->d_dev, entry->d_pdev, entry->d_ino,
entry->d_pino, entry->d_reclen, name);
entry = (dirent*)((char*)entry + entry->d_reclen);
@@ -702,7 +705,7 @@ netfs_rewind_dir(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_rewind_dir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->RewindDir(node, cookie);
PRINT("netfs_rewind_dir() done: %lx\n", error);
PRINT("netfs_rewind_dir() done: %" B_PRIx32 "\n", error);
return error;
}
@@ -716,7 +719,7 @@ netfs_walk(void *ns, void *_dir, const char *entryName,
PRINT("netfs_walk(%p, %p, `%s', %p, %p)\n", ns, 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: (%" B_PRIx32 ", `%s', %" B_PRIdINO ")\n", error,
(resolvedPath ? *resolvedPath : NULL), *vnid);
return error;
}
@@ -732,7 +735,7 @@ netfs_open_attrdir(void *ns, void *_node, void **cookie)
Node* node = (Node*)_node;
PRINT("netfs_open_attrdir(%p, %p)\n", ns, node);
status_t error = node->GetVolume()->OpenAttrDir(node, cookie);
PRINT("netfs_open_attrdir() done: (%lx, %p)\n", error, *cookie);
PRINT("netfs_open_attrdir() done: (%" B_PRIx32 ", %p)\n", error, *cookie);
return error;
}
@@ -744,7 +747,7 @@ netfs_close_attrdir(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_close_attrdir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->CloseAttrDir(node, cookie);
PRINT("netfs_close_attrdir() done: (%lx)\n", error);
PRINT("netfs_close_attrdir() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -756,7 +759,7 @@ netfs_free_attrdir_cookie(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_free_attrdir_cookie(%p, %p, %p)\n", ns, 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: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -773,7 +776,7 @@ netfs_read_attrdir(void *ns, void *_node, void *cookie, long *count,
status_t error = node->GetVolume()->ReadAttrDir(node, cookie, buffer,
bufferSize, _count, &_count);
*count = _count;
PRINT("netfs_read_attrdir() done: (%lx, %ld)\n", error, *count);
PRINT("netfs_read_attrdir() done: (%" B_PRIx32 ", %ld)\n", error, *count);
return error;
}
@@ -785,7 +788,7 @@ netfs_rewind_attrdir(void *ns, void *_node, void *cookie)
Node* node = (Node*)_node;
PRINT("netfs_rewind_attrdir(%p, %p, %p)\n", ns, node, cookie);
status_t error = node->GetVolume()->RewindAttrDir(node, cookie);
PRINT("netfs_rewind_attrdir() done: (%lx)\n", error);
PRINT("netfs_rewind_attrdir() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -796,11 +799,12 @@ netfs_read_attr(void *ns, void *_node, const char *name, int type,
void *buffer, size_t *bufferSize, off_t pos)
{
Node* node = (Node*)_node;
PRINT("netfs_read_attr(%p, %p, `%s', %d, %p, %lu, %Ld)\n", ns, node,
name, type, buffer, *bufferSize, pos);
PRINT("netfs_read_attr(%p, %p, `%s', %d, %p, %lu, %" B_PRIdOFF ")\n", ns,
node, name, type, buffer, *bufferSize, pos);
status_t error = node->GetVolume()->ReadAttr(node, name, type, pos, buffer,
*bufferSize, bufferSize);
PRINT("netfs_read_attr() done: (%lx, %ld)\n", error, *bufferSize);
PRINT("netfs_read_attr() done: (%" B_PRIx32 ", %ld)\n", error,
*bufferSize);
return error;
}
@@ -811,11 +815,12 @@ netfs_write_attr(void *ns, void *_node, const char *name, int type,
const void *buffer, size_t *bufferSize, off_t pos)
{
Node* node = (Node*)_node;
PRINT("netfs_write_attr(%p, %p, `%s', %d, %p, %lu, %Ld)\n", ns, node,
name, type, buffer, *bufferSize, pos);
PRINT("netfs_write_attr(%p, %p, `%s', %d, %p, %lu, %" B_PRIdOFF ")\n", ns,
node, name, type, buffer, *bufferSize, pos);
status_t error = node->GetVolume()->WriteAttr(node, name, type, pos, buffer,
*bufferSize, bufferSize);
PRINT("netfs_write_attr() done: (%lx, %ld)\n", error, *bufferSize);
PRINT("netfs_write_attr() done: (%" B_PRIx32 ", %ld)\n", error,
*bufferSize);
return error;
}
@@ -827,7 +832,7 @@ netfs_remove_attr(void *ns, void *_node, const char *name)
Node* node = (Node*)_node;
PRINT("netfs_remove_attr(%p, %p, `%s')\n", ns, node, name);
status_t error = node->GetVolume()->RemoveAttr(node, name);
PRINT("netfs_remove_attr() done: (%lx)\n", error);
PRINT("netfs_remove_attr() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -841,7 +846,7 @@ netfs_rename_attr(void *ns, void *_node, const char *oldName,
PRINT("netfs_rename_attr(%p, %p, `%s', `%s')\n", ns, 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: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -855,7 +860,7 @@ netfs_stat_attr(void *ns, void *_node, const char *name,
PRINT("netfs_stat_attr(%p, %p, `%s', %p)\n", ns, 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: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -872,7 +877,7 @@ netfs_open_query(void *ns, const char *queryString, ulong flags,
Volume* volume = volumeManager->GetRootVolume();
VolumePutter _(volume);
PRINT("netfs_open_query(%p, `%s', %lu, %ld, %ld, %p)\n", ns,
PRINT("netfs_open_query(%p, `%s', %lu, %" B_PRId32 ", %ld, %p)\n", ns,
queryString, flags, port, token, cookie);
status_t error = B_BAD_VALUE;
@@ -881,7 +886,7 @@ netfs_open_query(void *ns, const char *queryString, ulong flags,
(QueryIterator**)cookie);
}
PRINT("netfs_open_query() done: (%lx, %p)\n", error, *cookie);
PRINT("netfs_open_query() done: (%" B_PRIx32 ", %p)\n", error, *cookie);
return error;
}
@@ -895,7 +900,7 @@ netfs_close_query(void *ns, void *cookie)
status_t error = B_OK;
// no-op: we don't use this hook
PRINT("netfs_close_query() done: (%lx)\n", error);
PRINT("netfs_close_query() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -912,7 +917,7 @@ netfs_free_query_cookie(void *ns, void *node, void *cookie)
status_t error = B_OK;
volumeManager->GetQueryManager()->PutIterator(iterator);
PRINT("netfs_free_query_cookie() done: (%lx)\n", error);
PRINT("netfs_free_query_cookie() done: (%" B_PRIx32 ")\n", error);
return error;
}
@@ -938,7 +943,7 @@ netfs_read_query(void *ns, void *cookie, long *count,
*count = _count;
}
PRINT("netfs_read_query() done: (%lx, %ld)\n", error, *count);
PRINT("netfs_read_query() done: (%" B_PRIx32 ", %ld)\n", error, *count);
return error;
}