From 0d33cce6f7bbb71abe0086469f2f726151b0e62c Mon Sep 17 00:00:00 2001 From: Pavan Sondur Date: Sun, 22 Aug 2010 14:09:48 +0000 Subject: protocol/server: features/locks: Fix nonblocking entrylks, inodelks in locks and server. Signed-off-by: Pavan Vilas Sondur Signed-off-by: Anand V. Avati BUG: 960 () URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=960 --- xlators/protocol/server/src/server-helpers.c | 29 +++++++++++++++------------- xlators/protocol/server/src/server-helpers.h | 5 +++-- xlators/protocol/server/src/server.h | 1 + xlators/protocol/server/src/server3_1-fops.c | 20 +++++++++++-------- 4 files changed, 32 insertions(+), 23 deletions(-) (limited to 'xlators/protocol/server/src') diff --git a/xlators/protocol/server/src/server-helpers.c b/xlators/protocol/server/src/server-helpers.c index 380e47216bd..af1ba1a4eb8 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -138,7 +138,7 @@ free_state (server_state_t *state) int gf_add_locker (struct _lock_table *table, const char *volume, - loc_t *loc, fd_t *fd, pid_t pid) + loc_t *loc, fd_t *fd, pid_t pid, uint64_t owner) { int32_t ret = -1; struct _locker *new = NULL; @@ -162,7 +162,8 @@ gf_add_locker (struct _lock_table *table, const char *volume, dir = IA_ISDIR (fd->inode->ia_type); } - new->pid = pid; + new->pid = pid; + new->owner = owner; LOCK (&table->lock); { @@ -179,7 +180,7 @@ out: int gf_del_locker (struct _lock_table *table, const char *volume, - loc_t *loc, fd_t *fd, pid_t pid) + loc_t *loc, fd_t *fd, uint64_t owner) { struct _locker *locker = NULL; struct _locker *tmp = NULL; @@ -206,13 +207,13 @@ gf_del_locker (struct _lock_table *table, const char *volume, list_for_each_entry_safe (locker, tmp, head, lockers) { if (locker->fd && fd && - (locker->fd == fd) && (locker->pid == pid) + (locker->fd == fd) && (locker->owner == owner) && !strcmp (locker->volume, volume)) { list_move_tail (&locker->lockers, &del); } else if (locker->loc.inode && loc && (locker->loc.inode == loc->inode) && - (locker->pid == pid) + (locker->owner == owner) && !strcmp (locker->volume, volume)) { list_move_tail (&locker->lockers, &del); } @@ -307,11 +308,12 @@ do_lock_table_cleanup (xlator_t *this, server_connection_t *conn, goto out; } /* - pid = 0 is a special case that tells posix-locks + lock owner = 0 is a special case that tells posix-locks to release all locks from this transport */ - tmp_frame->root->pid = 0; - tmp_frame->root->trans = conn; + tmp_frame->root->pid = 0; + tmp_frame->root->lk_owner = 0; + tmp_frame->root->trans = conn; if (locker->fd) { STACK_WIND (tmp_frame, server_nop_cbk, bound_xl, @@ -338,8 +340,9 @@ do_lock_table_cleanup (xlator_t *this, server_connection_t *conn, list_for_each_entry_safe (locker, tmp, &dir_lockers, lockers) { tmp_frame = copy_frame (frame); - tmp_frame->root->pid = 0; - tmp_frame->root->trans = conn; + tmp_frame->root->lk_owner = 0; + tmp_frame->root->pid = 0; + tmp_frame->root->trans = conn; if (locker->fd) { STACK_WIND (tmp_frame, server_nop_cbk, bound_xl, @@ -560,10 +563,10 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn) tmp, &file_lockers, lockers) { tmp_frame = copy_frame (frame); /* - pid = 0 is a special case that tells posix-locks + lock_owner = 0 is a special case that tells posix-locks to release all locks from this transport */ - tmp_frame->root->pid = 0; + tmp_frame->root->lk_owner = 0; tmp_frame->root->trans = conn; if (locker->fd) { @@ -591,7 +594,7 @@ server_connection_destroy (xlator_t *this, server_connection_t *conn) list_for_each_entry_safe (locker, tmp, &dir_lockers, lockers) { tmp_frame = copy_frame (frame); - tmp_frame->root->pid = 0; + tmp_frame->root->lk_owner = 0; tmp_frame->root->trans = conn; if (locker->fd) { diff --git a/xlators/protocol/server/src/server-helpers.h b/xlators/protocol/server/src/server-helpers.h index 9e295cd1099..94c4d509b02 100644 --- a/xlators/protocol/server/src/server-helpers.h +++ b/xlators/protocol/server/src/server-helpers.h @@ -51,13 +51,14 @@ int32_t gf_add_locker (struct _lock_table *table, const char *volume, loc_t *loc, fd_t *fd, - pid_t pid); + pid_t pid, + uint64_t owner); int32_t gf_del_locker (struct _lock_table *table, const char *volume, loc_t *loc, fd_t *fd, - pid_t pid); + uint64_t owner); void server_print_request (call_frame_t *frame); diff --git a/xlators/protocol/server/src/server.h b/xlators/protocol/server/src/server.h index a35eeb166dc..62e5ef886cf 100644 --- a/xlators/protocol/server/src/server.h +++ b/xlators/protocol/server/src/server.h @@ -39,6 +39,7 @@ struct _locker { char *volume; loc_t loc; fd_t *fd; + uint64_t owner; pid_t pid; }; diff --git a/xlators/protocol/server/src/server3_1-fops.c b/xlators/protocol/server/src/server3_1-fops.c index 9fbf720716b..69f37d6b370 100644 --- a/xlators/protocol/server/src/server3_1-fops.c +++ b/xlators/protocol/server/src/server3_1-fops.c @@ -242,10 +242,11 @@ server_inodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret >= 0) { if (state->flock.l_type == F_UNLCK) gf_del_locker (conn->ltable, state->volume, - &state->loc, NULL, frame->root->pid); + &state->loc, NULL, frame->root->lk_owner); else gf_add_locker (conn->ltable, state->volume, - &state->loc, NULL, frame->root->pid); + &state->loc, NULL, frame->root->pid, + frame->root->lk_owner); } else if (op_errno != ENOSYS) { gf_log (this->name, GF_LOG_TRACE, "%"PRId64": INODELK %s (%"PRId64") ==> %"PRId32" (%s)", @@ -283,11 +284,12 @@ server_finodelk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (state->flock.l_type == F_UNLCK) gf_del_locker (conn->ltable, state->volume, NULL, state->fd, - frame->root->pid); + frame->root->lk_owner); else gf_add_locker (conn->ltable, state->volume, NULL, state->fd, - frame->root->pid); + frame->root->pid, + frame->root->lk_owner); } else if (op_errno != ENOSYS) { gf_log (this->name, GF_LOG_TRACE, "%"PRId64": FINODELK %"PRId64" (%"PRId64") ==> %"PRId32" (%s)", @@ -323,10 +325,11 @@ server_entrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret >= 0) { if (state->cmd == ENTRYLK_UNLOCK) gf_del_locker (conn->ltable, state->volume, - &state->loc, NULL, frame->root->pid); + &state->loc, NULL, frame->root->lk_owner); else gf_add_locker (conn->ltable, state->volume, - &state->loc, NULL, frame->root->pid); + &state->loc, NULL, frame->root->pid, + frame->root->lk_owner); } else if (op_errno != ENOSYS) { gf_log (this->name, GF_LOG_TRACE, "%"PRId64": INODELK %s (%"PRId64") ==> %"PRId32" (%s)", @@ -361,10 +364,11 @@ server_fentrylk_cbk (call_frame_t *frame, void *cookie, xlator_t *this, if (op_ret >= 0) { if (state->cmd == ENTRYLK_UNLOCK) gf_del_locker (conn->ltable, state->volume, - NULL, state->fd, frame->root->pid); + NULL, state->fd, frame->root->lk_owner); else gf_add_locker (conn->ltable, state->volume, - NULL, state->fd, frame->root->pid); + NULL, state->fd, frame->root->pid, + frame->root->lk_owner); } else if (op_errno != ENOSYS) { gf_log (this->name, GF_LOG_TRACE, "%"PRId64": FENTRYLK %"PRId64" (%"PRId64") " -- cgit