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/call-stub.h | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) (limited to 'libglusterfs/src/call-stub.h') diff --git a/libglusterfs/src/call-stub.h b/libglusterfs/src/call-stub.h index 83efa9a48..340468c3e 100644 --- a/libglusterfs/src/call-stub.h +++ b/libglusterfs/src/call-stub.h @@ -416,12 +416,12 @@ typedef struct { fop_lk_t fn; fd_t *fd; int32_t cmd; - struct flock lock; + struct gf_flock lock; } lk; struct { fop_lk_cbk_t fn; int32_t op_ret, op_errno; - struct flock lock; + struct gf_flock lock; } lk_cbk; /* inodelk */ @@ -430,7 +430,7 @@ typedef struct { const char *volume; loc_t loc; int32_t cmd; - struct flock lock; + struct gf_flock lock; } inodelk; struct { @@ -444,7 +444,7 @@ typedef struct { const char *volume; fd_t *fd; int32_t cmd; - struct flock lock; + struct gf_flock lock; } finodelk; struct { @@ -968,24 +968,24 @@ fop_lk_stub (call_frame_t *frame, fop_lk_t fn, fd_t *fd, int32_t cmd, - struct flock *lock); + struct gf_flock *lock); call_stub_t * fop_lk_cbk_stub (call_frame_t *frame, fop_lk_cbk_t fn, int32_t op_ret, int32_t op_errno, - struct flock *lock); + struct gf_flock *lock); call_stub_t * fop_inodelk_stub (call_frame_t *frame, fop_inodelk_t fn, const char *volume, loc_t *loc, int32_t cmd, - struct flock *lock); + struct gf_flock *lock); call_stub_t * fop_finodelk_stub (call_frame_t *frame, fop_finodelk_t fn, const char *volume, fd_t *fd, int32_t cmd, - struct flock *lock); + struct gf_flock *lock); call_stub_t * fop_entrylk_stub (call_frame_t *frame, fop_entrylk_t fn, -- cgit