diff options
| author | Pavan Sondur <pavan@gluster.com> | 2010-10-01 05:45:12 +0000 |
|---|---|---|
| committer | Vijay Bellur <vijay@dev.gluster.com> | 2010-10-01 05:05:53 -0700 |
| commit | fd2e7d007e5362f0738cd9a825349abcf5d27d8f (patch) | |
| tree | d86cd9b0162cd43cb6d1e573b24f6c49a5e353f4 /xlators/protocol/server/src | |
| parent | 55c6e672503a2451186e17b9c1b7daf6e3ae5463 (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/protocol/server/src')
| -rw-r--r-- | xlators/protocol/server/src/server-helpers.c | 4 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server.h | 2 | ||||
| -rw-r--r-- | xlators/protocol/server/src/server3_1-fops.c | 10 |
3 files changed, 8 insertions, 8 deletions
diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 59a49897116..e63bc200211 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -281,7 +281,7 @@ do_lock_table_cleanup (xlator_t *this, server_connection_t *conn, { struct list_head file_lockers, dir_lockers; call_frame_t *tmp_frame = NULL; - struct flock flock = {0, }; + struct gf_flock flock = {0, }; xlator_t *bound_xl = NULL; struct _locker *locker = NULL, *tmp = NULL; int ret = -1; @@ -518,7 +518,7 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn) struct list_head dir_lockers; struct _lock_table *ltable = NULL; struct _locker *locker = NULL, *tmp = NULL; - struct flock flock = {0,}; + struct gf_flock flock = {0,}; fd_t *fd = NULL; int32_t i = 0; fdentry_t *fdentries = NULL; diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h index a86c6b31824..5786ae5b588 100644 --- a/xlators/protocol/server/src/server.h +++ b/xlators/protocol/server/src/server.h @@ -185,7 +185,7 @@ struct _server_state { int mask; char is_revalidate; dict_t *dict; - struct flock flock; + struct gf_flock flock; const char *volume; dir_entry_t *entry; }; diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index f07be9bd7c6..1b0c407ee5e 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -172,7 +172,7 @@ out: int server_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) { gfs3_lk_rsp rsp = {0,}; rpcsvc_request_t *req = NULL; @@ -202,7 +202,7 @@ server_lk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, break; } - gf_flock_from_flock (&rsp.flock, lock); + gf_proto_flock_from_flock (&rsp.flock, lock); } else if (op_errno != ENOSYS) { gf_log (this->name, GF_LOG_TRACE, "%"PRId64": LK %"PRId64" (%"PRId64") ==> %"PRId32" (%s)", @@ -4314,7 +4314,7 @@ server_inodelk (rpcsvc_request_t *req) state->type = args.type; state->volume = gf_strdup (args.volume); - gf_flock_to_flock (&args.flock, &state->flock); + gf_proto_flock_to_flock (&args.flock, &state->flock); switch (state->type) { case GF_LK_F_RDLCK: @@ -4385,7 +4385,7 @@ server_finodelk (rpcsvc_request_t *req) state->type = args.type; - gf_flock_to_flock (&args.flock, &state->flock); + gf_proto_flock_to_flock (&args.flock, &state->flock); switch (state->type) { case GF_LK_F_RDLCK: @@ -4820,7 +4820,7 @@ server_lk (rpcsvc_request_t *req) break; } - gf_flock_to_flock (&args.flock, &state->flock); + gf_proto_flock_to_flock (&args.flock, &state->flock); switch (state->type) { case GF_LK_F_RDLCK: |