From fd2e7d007e5362f0738cd9a825349abcf5d27d8f Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Fri, 1 Oct 2010 05:45:12 +0000 Subject: Changes to replace flock with gf_flock across GlusterFS. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Vijay Bellur BUG: 865 (Add locks recovery support in GlusterFS) URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=865 --- libglusterfs/src/defaults.h | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) (limited to 'libglusterfs/src/defaults.h') diff --git a/libglusterfs/src/defaults.h b/libglusterfs/src/defaults.h index 7ddb1006..f0235821 100644 --- a/libglusterfs/src/defaults.h +++ b/libglusterfs/src/defaults.h @@ -181,15 +181,15 @@ int32_t default_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, - struct flock *flock); + struct gf_flock *flock); int32_t default_inodelk (call_frame_t *frame, xlator_t *this, const char *volume, loc_t *loc, int32_t cmd, - struct flock *flock); + struct gf_flock *flock); int32_t default_finodelk (call_frame_t *frame, xlator_t *this, const char *volume, fd_t *fd, int32_t cmd, - struct flock *flock); + struct gf_flock *flock); int32_t default_entrylk (call_frame_t *frame, xlator_t *this, const char *volume, loc_t *loc, const char *basename, @@ -396,15 +396,15 @@ int32_t default_lk_resume (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd, - struct flock *flock); + struct gf_flock *flock); int32_t default_inodelk_resume (call_frame_t *frame, xlator_t *this, const char *volume, loc_t *loc, int32_t cmd, - struct flock *flock); + struct gf_flock *flock); int32_t default_finodelk_resume (call_frame_t *frame, xlator_t *this, const char *volume, fd_t *fd, int32_t cmd, - struct flock *flock); + struct gf_flock *flock); int32_t default_entrylk_resume (call_frame_t *frame, xlator_t *this, const char *volume, loc_t *loc, const char *basename, @@ -627,7 +627,7 @@ default_removexattr_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t default_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, - int32_t op_ret, int32_t op_errno, struct flock *lock); + int32_t op_ret, int32_t op_errno, struct gf_flock *lock); int32_t default_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, -- cgit