From 6c6c7eba87190bfe3c721faaa190949ff611405b Mon Sep 17 00:00:00 2001 From: Anand Avati Date: Sun, 19 Jan 2014 19:44:06 -0800 Subject: locks: set @lock->frame = NULL when lock is granted This way disconnect cleanup code can differentiate which locks are granted vs blocked. Change-Id: I2a835c6865b6c804231d852953ea84eeccef35a3 BUG: 849630 Signed-off-by: Anand Avati Reviewed-on: http://review.gluster.org/6730 Tested-by: Gluster Build System Reviewed-by: Raghavendra Bhat Reviewed-by: Krishnan Parthasarathi --- xlators/features/locks/src/inodelk.c | 1 + 1 file changed, 1 insertion(+) (limited to 'xlators/features/locks/src/inodelk.c') diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index 969b67a61db..e7093e60ed5 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -478,6 +478,7 @@ pl_inode_setlk (xlator_t *this, pl_ctx_t *ctx, pl_inode_t *pl_inode, if (lock->fl_type != F_UNLCK) { ret = __lock_inodelk (this, pl_inode, lock, can_block, dom); if (ret == 0) { + lock->frame = NULL; gf_log (this->name, GF_LOG_TRACE, "%s (pid=%d) (lk-owner=%s) %"PRId64" - %"PRId64" => OK", lock->fl_type == F_UNLCK ? "Unlock" : "Lock", -- cgit