diff options
Diffstat (limited to 'contrib/fuse-lib/misc.c')
| -rw-r--r-- | contrib/fuse-lib/misc.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/contrib/fuse-lib/misc.c b/contrib/fuse-lib/misc.c index 877c3880de0..1a9b418e511 100644 --- a/contrib/fuse-lib/misc.c +++ b/contrib/fuse-lib/misc.c @@ -10,6 +10,7 @@ #include <string.h> #include <limits.h> #include <fcntl.h> +#include "glusterfs/glusterfs.h" #include "fuse_kernel.h" #include "fuse-misc.h" @@ -37,9 +38,9 @@ calc_timeout_nsec (double t) } void -convert_fuse_file_lock (struct fuse_file_lock *fl, struct flock *flock) +convert_fuse_file_lock (struct fuse_file_lock *fl, struct gf_flock *flock, + uint64_t lk_owner) { - memset (flock, 0, sizeof (struct flock)); flock->l_type = fl->type; flock->l_whence = SEEK_SET; flock->l_start = fl->start; @@ -48,4 +49,5 @@ convert_fuse_file_lock (struct fuse_file_lock *fl, struct flock *flock) else flock->l_len = fl->end - fl->start + 1; flock->l_pid = fl->pid; + set_lk_owner_from_uint64 (&flock->l_owner, lk_owner); } |