From 9564e09e5315846a38ed18e05630ef73be5b2adb Mon Sep 17 00:00:00 2001 From: Vijay Bellur Date: Thu, 22 Sep 2011 08:30:48 -0700 Subject: Revert "cluster/afr: eager locking of FD writes" This reverts commit 81456ec2dfb312ae60c5c4e6f960a3cbf8aaaa4c. Change-Id: Id03335117f5137f5d09781850bf4fba6eca0f73d Reviewed-on: http://review.gluster.com/492 Tested-by: Gluster Build System Reviewed-by: Vijay Bellur --- xlators/features/locks/src/inodelk.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (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 a90f244ec..6fa9f3997 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -131,8 +131,7 @@ static int inodelk_conflict (pl_inode_lock_t *l1, pl_inode_lock_t *l2) { return (inodelk_overlap (l1, l2) && - inodelk_type_conflict (l1, l2) && - !same_inodelk_owner (l1, l2)); + inodelk_type_conflict (l1, l2)); } /* Determine if lock is grantable or not */ -- cgit