diff options
| author | Vijay Bellur <vijay@gluster.com> | 2011-09-22 08:30:48 -0700 |
|---|---|---|
| committer | Vijay Bellur <vijay@gluster.com> | 2011-09-22 08:42:01 -0700 |
| commit | 9564e09e5315846a38ed18e05630ef73be5b2adb (patch) | |
| tree | ad633f8f65c61ec60a5238debe8918511e7bee2b /xlators/features/locks/src/inodelk.c | |
| parent | 7edb580b1a702096ee11ba28b66fad16fc83dbd6 (diff) | |
Revert "cluster/afr: eager locking of FD writes"v3.2.4qa3
This reverts commit 81456ec2dfb312ae60c5c4e6f960a3cbf8aaaa4c.
Change-Id: Id03335117f5137f5d09781850bf4fba6eca0f73d
Reviewed-on: http://review.gluster.com/492
Tested-by: Gluster Build System <jenkins@build.gluster.com>
Reviewed-by: Vijay Bellur <vijay@gluster.com>
Diffstat (limited to 'xlators/features/locks/src/inodelk.c')
| -rw-r--r-- | xlators/features/locks/src/inodelk.c | 3 |
1 files changed, 1 insertions, 2 deletions
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 */ |