From e227ae5751b312b9c42bef283d93d3e89d62225d Mon Sep 17 00:00:00 2001 From: Bill Zissimopoulos Date: Mon, 13 Jun 2016 17:21:40 -0700 Subject: [PATCH] inc: fuse: add fuse_flock definition --- inc/fuse/fuse.h | 2 +- inc/fuse/winfsp_fuse.h | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/inc/fuse/fuse.h b/inc/fuse/fuse.h index 004ea443..f5e51264 100644 --- a/inc/fuse/fuse.h +++ b/inc/fuse/fuse.h @@ -78,7 +78,7 @@ struct fuse_operations int (*create)(const char *path, fuse_mode_t mode, struct fuse_file_info *fi); int (*ftruncate)(const char *path, fuse_off_t off, struct fuse_file_info *fi); int (*fgetattr)(const char *path, struct fuse_stat *stbuf, struct fuse_file_info *fi); - int (*lock)(const char *path, struct fuse_file_info *fi, int cmd, struct flock *lock); + int (*lock)(const char *path, struct fuse_file_info *fi, int cmd, struct fuse_flock *lock); int (*utimens)(const char *path, const struct fuse_timespec tv[2]); int (*bmap)(const char *path, size_t blocksize, uint64_t *idx); unsigned int flag_nullpath_ok:1; diff --git a/inc/fuse/winfsp_fuse.h b/inc/fuse/winfsp_fuse.h index a8b68287..75d4a614 100644 --- a/inc/fuse/winfsp_fuse.h +++ b/inc/fuse/winfsp_fuse.h @@ -142,6 +142,15 @@ struct fuse_statvfs }; #endif +struct fuse_flock +{ + int16_t l_type; + int16_t l_whence; + fuse_off_t l_start; + fuse_off_t l_len; + fuse_pid_t l_pid; +}; + #if defined(WINFSP_DLL_INTERNAL) #define FSP_FUSE_ENV_INIT \ { \ @@ -190,6 +199,7 @@ struct fuse_statvfs #define fuse_stat stat #define fuse_statvfs statvfs +#define fuse_flock flock #define FSP_FUSE_ENV_INIT \ { \