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

4 files changed, 12 insertions, 12 deletions

diff --git a/xlators/performance/io-cache/src/io-cache.c b/xlators/performance/io-cache/src/io-cache.c
index 7de7640de64..f64d06816bd 100644
--- a/xlators/performance/io-cache/src/io-cache.c
+++ b/xlators/performance/io-cache/src/io-cache.c
@@ -1323,7 +1323,7 @@ ioc_ftruncate (call_frame_t *frame, xlator_t *this, fd_t *fd, off_t offset)
 
 int32_t
 ioc_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_errno, struct gf_flock *lock)
 {
 	STACK_UNWIND_STRICT (lk, frame, op_ret, op_errno, lock);
 	return 0;
@@ -1331,7 +1331,7 @@ ioc_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, int32_t op_ret,
 
 int32_t 
 ioc_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
-        struct flock *lock)
+        struct gf_flock *lock)
 {
 	ioc_inode_t  *ioc_inode = NULL;
 	uint64_t     tmp_inode = 0;
diff --git a/xlators/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c
index 72fbd567fcd..3d072d20fca 100644
--- a/xlators/performance/io-threads/src/io-threads.c
+++ b/xlators/performance/io-threads/src/io-threads.c
@@ -1000,7 +1000,7 @@ out:
 
 int32_t
 iot_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
-            int32_t op_ret, int32_t op_errno, struct flock *flock)
+            int32_t op_ret, int32_t op_errno, struct gf_flock *flock)
 {
 	STACK_UNWIND_STRICT (lk, frame, op_ret, op_errno, flock);
 	return 0;
@@ -1009,7 +1009,7 @@ iot_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int
 iot_lk_wrapper (call_frame_t *frame, xlator_t *this, fd_t *fd,
-                int32_t cmd, struct flock *flock)
+                int32_t cmd, struct gf_flock *flock)
 {
 	STACK_WIND (frame, iot_lk_cbk,
 		    FIRST_CHILD(this),
@@ -1021,7 +1021,7 @@ iot_lk_wrapper (call_frame_t *frame, xlator_t *this, fd_t *fd,
 
 int
 iot_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
-	struct flock *flock)
+	struct gf_flock *flock)
 {
 	call_stub_t *stub = NULL;
         int         ret = -1;
diff --git a/xlators/performance/quick-read/src/quick-read.c b/xlators/performance/quick-read/src/quick-read.c
index 5813d961c49..b5991fcde6f 100644
--- a/xlators/performance/quick-read/src/quick-read.c
+++ b/xlators/performance/quick-read/src/quick-read.c
@@ -1856,7 +1856,7 @@ qr_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this,
 
 int32_t
 qr_finodelk_helper (call_frame_t *frame, xlator_t *this, const char *volume,
-                    fd_t *fd, int32_t cmd, struct flock *lock)
+                    fd_t *fd, int32_t cmd, struct gf_flock *lock)
 {
         STACK_WIND (frame, qr_finodelk_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->finodelk, volume, fd, cmd, lock);
@@ -1866,7 +1866,7 @@ qr_finodelk_helper (call_frame_t *frame, xlator_t *this, const char *volume,
 
 int32_t
 qr_finodelk (call_frame_t *frame, xlator_t *this, const char *volume, fd_t *fd,
-             int32_t cmd, struct flock *lock)
+             int32_t cmd, struct gf_flock *lock)
 {
         int          flags = 0; 
         uint64_t     value = 0;
@@ -2193,7 +2193,7 @@ out:
 
 int32_t
 qr_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_errno, struct gf_flock *lock)
 {
 	QR_STACK_UNWIND (lk, frame, op_ret, op_errno, lock);
 	return 0;
@@ -2202,7 +2202,7 @@ qr_lk_cbk (call_frame_t *frame,	void *cookie, xlator_t *this, int32_t op_ret,
 
 int32_t
 qr_lk_helper (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
-              struct flock *lock)
+              struct gf_flock *lock)
 {
 	STACK_WIND (frame, qr_lk_cbk, FIRST_CHILD(this),
                     FIRST_CHILD(this)->fops->lk, fd, cmd, lock);
@@ -2213,7 +2213,7 @@ qr_lk_helper (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
 
 int32_t
 qr_lk (call_frame_t *frame, xlator_t *this, fd_t *fd, int32_t cmd,
-       struct flock *lock)
+       struct gf_flock *lock)
 {
         int          flags = 0;
         uint64_t     value = 0;
diff --git a/xlators/performance/stat-prefetch/src/stat-prefetch.c b/xlators/performance/stat-prefetch/src/stat-prefetch.c
index 20301cffd07..76ae9d20980 100644
--- a/xlators/performance/stat-prefetch/src/stat-prefetch.c
+++ b/xlators/performance/stat-prefetch/src/stat-prefetch.c
@@ -3381,7 +3381,7 @@ out:
 
 int32_t
 sp_inodelk_helper (call_frame_t *frame, xlator_t *this, const char *volume,
-                   loc_t *loc, int32_t cmd, struct flock *lock)
+                   loc_t *loc, int32_t cmd, struct gf_flock *lock)
 {
         uint64_t        value     = 0;
         sp_inode_ctx_t *inode_ctx = NULL;
@@ -3423,7 +3423,7 @@ unwind:
 
 int32_t
 sp_inodelk (call_frame_t *frame, xlator_t *this, const char *volume, loc_t *loc,
-            int32_t cmd, struct flock *lock)
+            int32_t cmd, struct gf_flock *lock)
 {
         int32_t         op_errno     = -1;
         call_stub_t    *stub         = NULL;