Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Got rid of from_fuse_error(). The client FS hooks are supposed to return

Browse Source 
negative error codes now (e.g. using the new error mapping mechanism). This
  is necessary since the read() and write() hooks have to return a size or a
  negative error code.
* Implemented Read(). We can now read sshfs files.


git-svn-id: file:///srv/svn/repos/haiku/haiku/trunk@29654 a95241bf-73f2-0310-859d-f6bbb57e9c96
This commit is contained in:
Ingo Weinhold 2009-03-22 15:49:10 +00:00
parent 39d58e2f49
commit b5884f05a3
2 changed files with 39 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEFileSystem.cpp
View File

@ -416,7 +416,7 @@ FUSEFileSystem::_InitCapabilities()
fNodeCapabilities.Set(FS_VNODE_CAPABILITY_OPEN, fFS->ops.open);
fNodeCapabilities.Set(FS_VNODE_CAPABILITY_CLOSE, fFS->ops.flush);
fNodeCapabilities.Set(FS_VNODE_CAPABILITY_FREE_COOKIE, fFS->ops.release);
// fNodeCapabilities.Set(FS_VNODE_CAPABILITY_READ, fFS->ops.read);
fNodeCapabilities.Set(FS_VNODE_CAPABILITY_READ, fFS->ops.read);
// fNodeCapabilities.Set(FS_VNODE_CAPABILITY_WRITE, fFS->ops.write);
//
// // directory operations

60
src/add-ons/kernel/file_systems/userlandfs/server/fuse/FUSEVolume.cpp
View File

@ -18,13 +18,6 @@
#include "../kernel_emu.h"
static inline status_t
from_fuse_error(int error)
{
return error < 0 ? error : -error;
}
struct FUSEVolume::DirEntryCache {
DirEntryCache()
:
@ -276,7 +269,7 @@ printf("FUSEVolume::Mount()\n");
struct stat st;
int fuseError = fuse_fs_getattr(fFS, "/", &st);
if (fuseError != 0)
RETURN_ERROR(from_fuse_error(fuseError));
RETURN_ERROR(fuseError);
if (!fUseNodeIDs)
st.st_ino = FUSE_ROOT_ID;
@ -343,7 +336,7 @@ FUSEVolume::ReadFSInfo(fs_info* info)
struct statvfs st;
int fuseError = fuse_fs_statfs(fFS, "/", &st);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
info->flags = B_FS_IS_PERSISTENT; // assume the FS is persistent
info->block_size = st.f_bsize;
@ -600,7 +593,7 @@ PRINT(("FUSEVolume::ReadStat(%p (%lld), %p)\n", node, node->id, st));
// stat the path
int fuseError = fuse_fs_getattr(fFS, path, st);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
return B_OK;
}
@ -659,7 +652,7 @@ PRINT(("FUSEVolume::Open(%p (%lld), %#x)\n", node, node->id, openMode));
// open the dir
int fuseError = fuse_fs_open(fFS, path, cookie);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
cookieDeleter.Detach();
*_cookie = cookie;
@ -688,7 +681,7 @@ FUSEVolume::Close(void* _node, void* _cookie)
// flush the file
int fuseError = fuse_fs_flush(fFS, path, cookie);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
return B_OK;
}
@ -716,18 +709,41 @@ FUSEVolume::FreeCookie(void* _node, void* _cookie)
// release the file
int fuseError = fuse_fs_release(fFS, path, cookie);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
return B_OK;
}
status_t
FUSEVolume::Read(void* node, void* cookie, off_t pos, void* buffer,
size_t bufferSize, size_t* bytesRead)
FUSEVolume::Read(void* _node, void* _cookie, off_t pos, void* buffer,
size_t bufferSize, size_t* _bytesRead)
{
// TODO: Implement!
return B_UNSUPPORTED;
FUSENode* node = (FUSENode*)_node;
FileCookie* cookie = (FileCookie*)_cookie;
*_bytesRead = 0;
AutoLocker<Locker> locker(fLock);
// get a path for the node
char path[B_PATH_NAME_LENGTH];
size_t pathLen;
status_t error = _BuildPath(node, path, pathLen);
if (error != B_OK)
RETURN_ERROR(error);
locker.Unlock();
// read the file
int bytesRead = fuse_fs_read(fFS, path, (char*)buffer, bufferSize, pos,
cookie);
if (bytesRead < 0)
return bytesRead;
*_bytesRead = bytesRead;
return B_OK;
}
@ -790,7 +806,7 @@ PRINT(("FUSEVolume::OpenDir(%p (%lld), %p)\n", node, node->id, _cookie));
// open the dir
int fuseError = fuse_fs_opendir(fFS, path, cookie);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
}
cookieDeleter.Detach();
@ -832,7 +848,7 @@ FUSEVolume::FreeDirCookie(void* _node, void* _cookie)
// release the dir
int fuseError = fuse_fs_releasedir(fFS, path, cookie);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
return B_OK;
}
@ -883,7 +899,7 @@ PRINT((" using readdir() interface\n"));
&_AddReadDirEntry, offset, cookie);
}
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
locker.Lock();
@ -1040,7 +1056,7 @@ FUSEVolume::_InternalGetNode(FUSENode* dir, const char* entryName,
struct stat st;
int fuseError = fuse_fs_getattr(fFS, path, &st);
if (fuseError != 0)
return from_fuse_error(fuseError);
return fuseError;
locker.Lock();
@ -1246,7 +1262,7 @@ name, type, nodeID, offset));
locker.Lock();
if (fuseError != 0) {
buffer->error = from_fuse_error(fuseError);
buffer->error = fuseError;
return 0;
}