From 43d9661f4ad1566981676d08f6ddf02109ca5757 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Sat, 19 May 2012 11:14:25 +0530 Subject: protocol/server: del_locker should delete one locker per unlock Change-Id: Ie3281d693c1b6d1f631c77aece8039a08ad8f8fb BUG: 771595 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.com/3370 Reviewed-by: Amar Tumballi Tested-by: Gluster Build System Reviewed-by: Anand Avati --- xlators/protocol/server/src/server-helpers.c | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 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 01c21636b..8827a48b0 100644 --- a/xlators/protocol/server/src/server-helpers.c +++ b/xlators/protocol/server/src/server-helpers.c @@ -188,13 +188,11 @@ gf_del_locker (server_connection_t *conn, const char *volume, struct _locker *tmp = NULL; int32_t ret = -1; struct list_head *head = NULL; - struct list_head del; struct _lock_table *table = NULL; + int found = 0; GF_VALIDATE_OR_GOTO ("server", volume, out); - INIT_LIST_HEAD (&del); - pthread_mutex_lock (&conn->lock); { table = conn->ltable; @@ -210,19 +208,21 @@ gf_del_locker (server_connection_t *conn, const char *volume, continue; if (locker->fd && fd && (locker->fd == fd)) - list_move_tail (&locker->lockers, &del); + found = 1; else if (locker->loc.inode && loc && (locker->loc.inode == loc->inode)) - list_move_tail (&locker->lockers, &del); + found = 1; + if (found) { + list_del_init (&locker->lockers); + break; + } } + if (!found) + locker = NULL; } pthread_mutex_unlock (&conn->lock); - tmp = NULL; - locker = NULL; - - list_for_each_entry_safe (locker, tmp, &del, lockers) { - list_del_init (&locker->lockers); + if (locker) { if (locker->fd) fd_unref (locker->fd); else -- cgit