ivampiresp/Spdk
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blobfs/fuse: account for leading slash in filenames

Browse Source 
The RocksDB plugin no longer strips the leading slash
from filenames - so update the fuse plugin accordingly.

If and when BlobFS supports a real directory structure,
we'll need to avoid the leading slashes, but for now let's
just make the fuse plugin usable.

Signed-off-by: Jim Harris <james.r.harris@intel.com>
Change-Id: I5609dd4d5fd3db85f266963172f35ac004869d66

Reviewed-on: https://review.gerrithub.io/407231
Tested-by: SPDK Automated Test System <sys_sgsw@intel.com>
Reviewed-by: Daniel Verkamp <daniel.verkamp@intel.com>
Reviewed-by: Ben Walker <benjamin.walker@intel.com>
This commit is contained in:
Jim Harris 2018-04-06 04:22:00 -07:00 committed by Daniel Verkamp
parent c149736596
commit bb5f94f838
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
test/blobfs/fuse/fuse.c
View File

@ -87,7 +87,7 @@ spdk_fuse_getattr(const char *path, struct stat *stbuf, struct fuse_file_info *f
return 0; return 0;
} }
rc = spdk_fs_file_stat(g_fs, g_channel, &path[1], &stat); rc = spdk_fs_file_stat(g_fs, g_channel, path, &stat);
if (rc == 0) { if (rc == 0) {
stbuf->st_mode = S_IFREG | 0644; stbuf->st_mode = S_IFREG | 0644;
stbuf->st_nlink = 1; stbuf->st_nlink = 1;
@ -114,7 +114,7 @@ spdk_fuse_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
file = spdk_fs_iter_get_file(iter); file = spdk_fs_iter_get_file(iter);
iter = spdk_fs_iter_next(iter); iter = spdk_fs_iter_next(iter);
filename = spdk_file_get_name(file); filename = spdk_file_get_name(file);
filler(buf, filename, NULL, 0, 0); filler(buf, &filename[1], NULL, 0, 0);
} }
return 0; return 0;
@ -123,13 +123,13 @@ spdk_fuse_readdir(const char *path, void *buf, fuse_fill_dir_t filler,
static int static int
spdk_fuse_mknod(const char *path, mode_t mode, dev_t rdev) spdk_fuse_mknod(const char *path, mode_t mode, dev_t rdev)
{ {
return spdk_fs_create_file(g_fs, g_channel, &path[1]); return spdk_fs_create_file(g_fs, g_channel, path);
} }
static int static int
spdk_fuse_unlink(const char *path) spdk_fuse_unlink(const char *path)
{ {
return spdk_fs_delete_file(g_fs, g_channel, &path[1]); return spdk_fs_delete_file(g_fs, g_channel, path);
} }
static int static int
@ -138,7 +138,7 @@ spdk_fuse_truncate(const char *path, off_t size, struct fuse_file_info *fi)
struct spdk_file *file; struct spdk_file *file;
int rc; int rc;
rc = spdk_fs_open_file(g_fs, g_channel, &path[1], 0, &file); rc = spdk_fs_open_file(g_fs, g_channel, path, 0, &file);
if (rc != 0) { if (rc != 0) {
return -rc; return -rc;
} }
@ -161,7 +161,7 @@ spdk_fuse_open(const char *path, struct fuse_file_info *info)
struct spdk_file *file; struct spdk_file *file;
int rc; int rc;
rc = spdk_fs_open_file(g_fs, g_channel, &path[1], 0, &file); rc = spdk_fs_open_file(g_fs, g_channel, path, 0, &file);
if (rc != 0) { if (rc != 0) {
return -rc; return -rc;
} }
@ -216,7 +216,7 @@ spdk_fuse_fsync(const char *path, int datasync, struct fuse_file_info *info)
static int static int
spdk_fuse_rename(const char *old_path, const char *new_path, unsigned int flags) spdk_fuse_rename(const char *old_path, const char *new_path, unsigned int flags)
{ {
return spdk_fs_rename_file(g_fs, g_channel, &old_path[1], &new_path[1]); return spdk_fs_rename_file(g_fs, g_channel, old_path, new_path);
} }
static struct fuse_operations spdk_fuse_oper = { static struct fuse_operations spdk_fuse_oper = {