diff options
| author | Raghavendra Bhat <raghavendrabhat@gluster.com> | 2011-06-15 23:52:48 +0000 |
|---|---|---|
| committer | Anand Avati <avati@gluster.com> | 2011-06-16 09:14:49 -0700 |
| commit | 8791651c43337c081d684c04c4018c2c3eb56ac5 (patch) | |
| tree | 1897a5f498e0ddea9f7cb57638483eb7773e8c19 /xlators | |
| parent | 4566fb78c16948f91e7d5b1934d8722b51508053 (diff) | |
features/locks: check for inodelk lists and blocked inodelks instead of entrylk in inodelk.c
Signed-off-by: Raghavendra Bhat <raghavendrabhat@gluster.com>
Signed-off-by: Anand Avati <avati@gluster.com>
BUG: 3032 (entrylks are checked instead of inodelks while checking the blocked inodelks conflict)
URL: http://bugs.gluster.com/cgi-bin/bugzilla3/show_bug.cgi?id=3032
Diffstat (limited to 'xlators')
| -rw-r--r-- | xlators/features/locks/src/inodelk.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/xlators/features/locks/src/inodelk.c b/xlators/features/locks/src/inodelk.c index bc59ea858..f3c158ebb 100644 --- a/xlators/features/locks/src/inodelk.c +++ b/xlators/features/locks/src/inodelk.c @@ -158,7 +158,7 @@ __blocked_lock_conflict (pl_dom_list_t *dom, pl_inode_lock_t *lock) pl_inode_lock_t *l = NULL; pl_inode_lock_t *ret = NULL; - if (list_empty (&dom->blocked_entrylks)) + if (list_empty (&dom->blocked_inodelks)) return NULL; list_for_each_entry (l, &dom->blocked_inodelks, blocked_locks) { @@ -177,12 +177,12 @@ __owner_has_lock (pl_dom_list_t *dom, pl_inode_lock_t *newlock) { pl_inode_lock_t *lock = NULL; - list_for_each_entry (lock, &dom->entrylk_list, list) { + list_for_each_entry (lock, &dom->inodelk_list, list) { if (same_inodelk_owner (lock, newlock)) return 1; } - list_for_each_entry (lock, &dom->blocked_entrylks, blocked_locks) { + list_for_each_entry (lock, &dom->blocked_inodelks, blocked_locks) { if (same_inodelk_owner (lock, newlock)) return 1; } |