summaryrefslogtreecommitdiffstats
path: root/xlators/features/locks/src/posix.c
diff options
context:
space:
mode:
authorPavan Sondur <pavan@gluster.com>2010-10-01 05:45:12 +0000
committerVijay Bellur <vijay@dev.gluster.com>2010-10-01 05:05:53 -0700
commitfd2e7d007e5362f0738cd9a825349abcf5d27d8f (patch)
treed86cd9b0162cd43cb6d1e573b24f6c49a5e353f4 /xlators/features/locks/src/posix.c
parent55c6e672503a2451186e17b9c1b7daf6e3ae5463 (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 'xlators/features/locks/src/posix.c')
-rw-r--r--xlators/features/locks/src/posix.c12
1 files changed, 6 insertions, 6 deletions
diff --git a/xlators/features/locks/src/posix.c b/xlators/features/locks/src/posix.c
index 7c8ead8b383..1b3a1a60499 100644
--- a/xlators/features/locks/src/posix.c
+++ b/xlators/features/locks/src/posix.c
@@ -932,7 +932,7 @@ unlock:
int
pl_lk (call_frame_t *frame, xlator_t *this,
- fd_t *fd, int32_t cmd, struct flock *flock)
+ fd_t *fd, int32_t cmd, struct gf_flock *flock)
{
void *transport = NULL;
pid_t client_pid = 0;
@@ -984,7 +984,7 @@ pl_lk (call_frame_t *frame, xlator_t *this,
/* fall through */
case F_RESLK_LCK:
- memcpy (&reqlock->user_flock, flock, sizeof (struct flock));
+ memcpy (&reqlock->user_flock, flock, sizeof (struct gf_flock));
reqlock->frame = frame;
reqlock->this = this;
@@ -1065,7 +1065,7 @@ pl_lk (call_frame_t *frame, xlator_t *this,
case F_SETLK64:
#endif
case F_SETLK:
- memcpy (&reqlock->user_flock, flock, sizeof (struct flock));
+ memcpy (&reqlock->user_flock, flock, sizeof (struct gf_flock));
ret = pl_verify_reservelk (this, pl_inode, reqlock, can_block);
if (ret < 0) {
gf_log (this->name, GF_LOG_TRACE,
@@ -1439,7 +1439,7 @@ out:
}
void
-pl_dump_lock (char *str, int size, struct flock *flock,
+pl_dump_lock (char *str, int size, struct gf_flock *flock,
uint64_t owner, void *trans)
{
char *type_str = NULL;
@@ -1794,11 +1794,11 @@ fini (xlator_t *this)
int
pl_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);
int
pl_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);
int
pl_entrylk (call_frame_t *frame, xlator_t *this,