diff options
Diffstat (limited to 'src/fuse_i.h')
| -rw-r--r-- | src/fuse_i.h | 38 |
1 files changed, 6 insertions, 32 deletions
diff --git a/src/fuse_i.h b/src/fuse_i.h index 399b09437..f4d49faca 100644 --- a/src/fuse_i.h +++ b/src/fuse_i.h @@ -30,39 +30,14 @@ __LINE__) /* pointer to the fuse_operations structure of this translator process */ -extern const struct fuse_operations_compat22 *fuse_ops_compat22; -extern const struct fuse_operations_compat2 *fuse_ops_compat2; extern const struct fuse_operations *fuse_ops25; -#define FUSE_OP_HAVE(a) (fuse_ops25 ? \ - (fuse_ops25->a != NULL) \ - : ((fuse_ops_compat22) ? \ - (fuse_ops_compat22->a != NULL) : \ - (fuse_ops_compat2->a != NULL))) -#define FUSE_OP_CALL(a,b...) (fuse_ops25 ? \ - (fuse_ops25->a(b)) : \ - ((fuse_ops_compat22) ? \ - (fuse_ops_compat22->a(b)) : \ - (fuse_ops_compat2->a(b)))) - -#define FUSE_OP_HAVE22(a) (fuse_ops25 ? \ - (fuse_ops25->a != NULL) \ - : ((fuse_ops_compat22) ? \ - (fuse_ops_compat22->a != NULL) : 0)) - -#define FUSE_OP_CALL22(a,b...) (fuse_ops25 ? \ - (fuse_ops25->a(b)) : \ - ((fuse_ops_compat22) ? \ - (fuse_ops_compat22->a(b)) : (0))) - -#define NN_INFO(dir) (fuse_ops25 ? \ - ((void *) &(dir)->nn->info.info25) \ - : ((void *) &(dir)->nn->info.compat22)) - -#define NN_INFO_APPLY(node,key) do { \ - if(fuse_ops25) (node)->nn->info.info25.key; \ - else (node)->nn->info.compat22.key; \ - } while(0) +#define FUSE_OP_HAVE(a) (fuse_ops25->a != NULL) +#define FUSE_OP_CALL(a,b...) (fuse_ops25->a(b)) + +#define NN_INFO(dir) ((void *) &(dir)->nn->info.info25) + +#define NN_INFO_APPLY(node,key) (node)->nn->info.info25.key extern __thread struct fuse_context *libfuse_ctx; @@ -83,7 +58,6 @@ struct netnode { /* information about the opened file */ union { - struct fuse_file_info_compat22 compat22; struct fuse_file_info info25; } info; |