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

3 files changed, 12 insertions, 12 deletions

diff --git a/xlators/debug/error-gen/src/error-gen.c b/xlators/debug/error-gen/src/error-gen.c
index 095b077b4..b9ed44b21 100644
--- a/xlators/debug/error-gen/src/error-gen.c
+++ b/xlators/debug/error-gen/src/error-gen.c
@@ -1526,7 +1526,7 @@ error_gen_removexattr (call_frame_t *frame, xlator_t *this, loc_t *loc,
 
 int
 error_gen_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)
 {
 	STACK_UNWIND_STRICT (lk, frame, op_ret, op_errno, lock);
 	return 0;
@@ -1535,7 +1535,7 @@ error_gen_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 error_gen_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
-	      struct flock *lock)
+	      struct gf_flock *lock)
 {
 	int              op_errno = 0;
         eg_t            *egp = NULL;
@@ -1574,7 +1574,7 @@ error_gen_inodelk_cbk (call_frame_t *frame, void *cookie,
 int
 error_gen_inodelk (call_frame_t *frame, xlator_t *this,
 		   const char *volume, loc_t *loc, int32_t cmd,
-                   struct flock *lock)
+                   struct gf_flock *lock)
 {
 	int              op_errno = 0;
         eg_t            *egp = NULL;
@@ -1613,7 +1613,7 @@ error_gen_finodelk_cbk (call_frame_t *frame, void *cookie,
 int
 error_gen_finodelk (call_frame_t *frame, xlator_t *this,
 		    const char *volume, fd_t *fd, int32_t cmd,
-                    struct flock *lock)
+                    struct gf_flock *lock)
 {
 	int              op_errno = 0;
         eg_t            *egp = NULL;
diff --git a/xlators/debug/io-stats/src/io-stats.c b/xlators/debug/io-stats/src/io-stats.c
index dcdd42645..4a96ca3c2 100644
--- a/xlators/debug/io-stats/src/io-stats.c
+++ b/xlators/debug/io-stats/src/io-stats.c
@@ -797,7 +797,7 @@ io_stats_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 io_stats_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)
 {
         END_FOP_LATENCY (frame, LK);
         STACK_UNWIND_STRICT (lk, frame, op_ret, op_errno, lock);
@@ -864,7 +864,7 @@ io_stats_entrylk (call_frame_t *frame, xlator_t *this,
 
 int
 io_stats_inodelk (call_frame_t *frame, xlator_t *this,
-                  const char *volume, loc_t *loc, int32_t cmd, struct flock *flock)
+                  const char *volume, loc_t *loc, int32_t cmd, struct gf_flock *flock)
 {
 
         BUMP_FOP (INODELK);
@@ -892,7 +892,7 @@ io_stats_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 io_stats_finodelk (call_frame_t *frame, xlator_t *this,
-                   const char *volume, fd_t *fd, int32_t cmd, struct flock *flock)
+                   const char *volume, fd_t *fd, int32_t cmd, struct gf_flock *flock)
 {
         BUMP_FOP (FINODELK);
 
@@ -1489,7 +1489,7 @@ io_stats_fstat (call_frame_t *frame, xlator_t *this,
 
 int
 io_stats_lk (call_frame_t *frame, xlator_t *this,
-             fd_t *fd, int32_t cmd, struct flock *lock)
+             fd_t *fd, int32_t cmd, struct gf_flock *lock)
 {
         BUMP_FOP (LK);
 
diff --git a/xlators/debug/trace/src/trace.c b/xlators/debug/trace/src/trace.c
index f5af77681..43e9c7a7a 100644
--- a/xlators/debug/trace/src/trace.c
+++ b/xlators/debug/trace/src/trace.c
@@ -1121,7 +1121,7 @@ trace_fstat_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 trace_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)
 {
         if (trace_fop_names[GF_FOP_LK].enabled) {
                 if (op_ret >= 0) {
@@ -1226,7 +1226,7 @@ trace_entrylk (call_frame_t *frame, xlator_t *this,
 
 int
 trace_inodelk (call_frame_t *frame, xlator_t *this, const char *volume,
-               loc_t *loc, int32_t cmd, struct flock *flock)
+               loc_t *loc, int32_t cmd, struct gf_flock *flock)
 {
         if (trace_fop_names[GF_FOP_INODELK].enabled) {
                 gf_log (this->name, GF_LOG_NORMAL,
@@ -1260,7 +1260,7 @@ trace_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 trace_finodelk (call_frame_t *frame, xlator_t *this, const char *volume,
-                fd_t *fd, int32_t cmd, struct flock *flock)
+                fd_t *fd, int32_t cmd, struct gf_flock *flock)
 {
         if (trace_fop_names[GF_FOP_FINODELK].enabled) {
                 gf_log (this->name, GF_LOG_NORMAL,
@@ -1938,7 +1938,7 @@ trace_fstat (call_frame_t *frame, xlator_t *this, fd_t *fd)
 
 int
 trace_lk (call_frame_t *frame, xlator_t *this, fd_t *fd,
-          int32_t cmd, struct flock *lock)
+          int32_t cmd, struct gf_flock *lock)
 {
         if (trace_fop_names[GF_FOP_LK].enabled) {
                 gf_log (this->name, GF_LOG_NORMAL,