Public/winfsp
1
0
Fork 0
mirror of https://github.com/winfsp/winfsp.git synced 2025-04-23 00:43:00 -05:00
Code Issues Packages Projects Releases Wiki Activity

dll: fuse3: testing

Browse Source
This commit is contained in:
Bill Zissimopoulos 2018-07-25 10:04:23 -07:00
parent 6932d42039
commit 4a653a8bc0
No known key found for this signature in database
GPG Key ID: 3D4F95D52C7B3EA3
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/dll/fuse/library.h
View File

@ -56,12 +56,12 @@ struct fuse
FSP_FILE_SYSTEM *FileSystem; FSP_FILE_SYSTEM *FileSystem;
FSP_SERVICE *Service; /* weak */ FSP_SERVICE *Service; /* weak */
volatile int exited; volatile int exited;
struct fuse3 *fuse3;
}; };
struct fsp_fuse_context_header struct fsp_fuse_context_header
{ {
char *PosixPath; char *PosixPath;
struct fuse3 *fuse3;
__declspec(align(MEMORY_ALLOCATION_ALIGNMENT)) UINT8 ContextBuf[]; __declspec(align(MEMORY_ALLOCATION_ALIGNMENT)) UINT8 ContextBuf[];
}; };

10
src/dll/fuse3/fuse2to3.c
View File

@ -19,7 +19,7 @@
static inline struct fuse3 *fuse2to3_getfuse3(void) static inline struct fuse3 *fuse2to3_getfuse3(void)
{ {
return FSP_FUSE_HDR_FROM_CONTEXT(fsp_fuse_get_context_internal())->fuse3; return fsp_fuse_get_context_internal()->fuse->fuse3;
} }
static inline void fuse2to3_fi2from3(struct fuse_file_info *fi, struct fuse3_file_info *fi3) static inline void fuse2to3_fi2from3(struct fuse_file_info *fi, struct fuse3_file_info *fi3)
@ -280,11 +280,8 @@ static int fuse2to3_fsyncdir(const char *path, int datasync, struct fuse_file_in
static void *fuse2to3_init(struct fuse_conn_info *conn) static void *fuse2to3_init(struct fuse_conn_info *conn)
{ {
struct fuse_context *context = fsp_fuse_get_context_internal(); struct fuse_context *context = fsp_fuse_get_context_internal();
struct fuse3 *f3 = context->private_data;
struct fuse *f = context->fuse; struct fuse *f = context->fuse;
struct fuse3 *f3 = f->fuse3;
FSP_FUSE_HDR_FROM_CONTEXT(context)->fuse3 = f3;
context->private_data = f->data = f3->data;
struct fuse3_conn_info conn3; struct fuse3_conn_info conn3;
fuse2to3_conn3from2(&conn3, conn); fuse2to3_conn3from2(&conn3, conn);
@ -602,7 +599,7 @@ FSP_FUSE_API int fsp_fuse3_mount(struct fsp_fuse_env *env,
if (0 == ch) if (0 == ch)
goto fail; goto fail;
f = fsp_fuse_new(env, ch, &f3->args, &fuse2to3_ops, sizeof fuse2to3_ops, f3); f = fsp_fuse_new(env, ch, &f3->args, &fuse2to3_ops, sizeof fuse2to3_ops, f3->data);
if (0 == f) if (0 == f)
goto fail; goto fail;
@ -620,6 +617,7 @@ FSP_FUSE_API int fsp_fuse3_mount(struct fsp_fuse_env *env,
/* Free the args which are no longer needed. */ /* Free the args which are no longer needed. */
fsp_fuse_opt_free_args(env, &f3->args); fsp_fuse_opt_free_args(env, &f3->args);
f->fuse3 = f3;
f3->fuse = f; f3->fuse = f;
return 0; return 0;