diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-10-01 05:45:12 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-01 05:05:53 -0700 |
| commit | fd2e7d007e5362f0738cd9a825349abcf5d27d8f (patch) | |
| tree | d86cd9b0162cd43cb6d1e573b24f6c49a5e353f4 /contrib | |
| parent | 55c6e672503a2451186e17b9c1b7daf6e3ae5463 (diff) | |
Changes to replace flock with gf_flock across GlusterFS.
Signed-off-by: Pavan Vilas Sondur <pavan@gluster.com>
Signed-off-by: Vijay Bellur <vijay@dev.gluster.com>
BUG: 865 (Add locks recovery support in GlusterFS)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865
Diffstat (limited to 'contrib')
| -rw-r--r-- | contrib/fuse-include/fuse-misc.h | 3 | ||||
| -rw-r--r-- | contrib/fuse-lib/misc.c | 5 |
2 files changed, 6 insertions, 2 deletions
diff --git a/contrib/fuse-include/fuse-misc.h b/contrib/fuse-include/fuse-misc.h index 16b47347262..f905215b0a1 100644 --- a/contrib/fuse-include/fuse-misc.h +++ b/contrib/fuse-include/fuse-misc.h @@ -10,4 +10,5 @@ unsigned long calc_timeout_sec (double t); unsigned int calc_timeout_nsec (double t); -void convert_fuse_file_lock (struct fuse_file_lock *fl, struct flock *flock); +void convert_fuse_file_lock (struct fuse_file_lock *fl, struct gf_flock *flock, + uint64_t lk_owner); diff --git a/contrib/fuse-lib/misc.c b/contrib/fuse-lib/misc.c index 877c3880de0..28a9284bf96 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.h" #include "fuse_kernel.h" #include "fuse-misc.h" @@ -37,7 +38,8 @@ 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; @@ -48,4 +50,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; + flock->l_owner = lk_owner; } |