From bb1fb1e1614d2c1646e2d512779d723b66b2a766 Mon Sep 17 00:00:00 2001 From: Pranith Kumar K Date: Mon, 5 Aug 2013 22:20:19 +0530 Subject: protocol/server: Relax lktable finodelk del_locker check Problem: Client xlator issues finodelk using anon-fd when the fd is not opened on the file. This can also happen between attempts to re-open the file after client disconnects. It can so happen that lock is taken using anon-fd and the file is now re-opened and unlock would come with re-opened fd. This will lead to leak in lk-table entry, which also holds reference to fd which leads to fd-leak on the brick. Fix: Don't check for fds to be equal for tracking finodelks. Since inodelk is identified by (gfid, connection, lk-owner) fd equality is not needed. Change-Id: I62152d84caef0b863c973845e618076d388e6848 BUG: 993247 Signed-off-by: Pranith Kumar K Reviewed-on: http://review.gluster.org/5499 Tested-by: Gluster Build System Reviewed-by: Anand Avati --- libglusterfs/src/lock-table.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) (limited to 'libglusterfs/src/lock-table.c') diff --git a/libglusterfs/src/lock-table.c b/libglusterfs/src/lock-table.c index a2fff2e3..42b7ed8a 100644 --- a/libglusterfs/src/lock-table.c +++ b/libglusterfs/src/lock-table.c @@ -97,7 +97,12 @@ gf_del_locker (struct _lock_table *table, const char *volume, strcmp (locker->volume, volume)) continue; - if (locker->fd && fd && (locker->fd == fd)) + /* + * It is possible for inodelk lock to come on anon-fd + * and inodelk unlock to come on normal fd in case of + * client re-opens. So don't check for fds to be equal. + */ + if (locker->fd && fd) list_move_tail (&locker->lockers, &del); else if (locker->loc.inode && loc && (locker->loc.inode == loc->inode)) -- cgit