Whamcloud - gitweb
git://git.whamcloud.com
/
fs
/
lustre-release.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
ldlm_handle_convert was putting the lock immediately onto the conversion queue and
[fs/lustre-release.git]
/
lustre
/
ldlm
/
ldlm_lock.c
diff --git
a/lustre/ldlm/ldlm_lock.c
b/lustre/ldlm/ldlm_lock.c
index
facceee
..
900decb
100644
(file)
--- a/
lustre/ldlm/ldlm_lock.c
+++ b/
lustre/ldlm/ldlm_lock.c
@@
-819,8
+819,12
@@
struct ldlm_resource *ldlm_lock_convert(struct ldlm_lock *lock, int new_mode,
if (lock->l_completion_ast)
lock->l_completion_ast(lock, 0);
}
if (lock->l_completion_ast)
lock->l_completion_ast(lock, 0);
}
- } else
+ } else {
+ /* FIXME: We should try the conversion right away and possibly
+ * return success without the need for an extra AST */
list_add_tail(&lock->l_res_link, &res->lr_converting);
list_add_tail(&lock->l_res_link, &res->lr_converting);
+ *flags |= LDLM_FL_BLOCK_CONV;
+ }
l_unlock(&ns->ns_lock);
l_unlock(&ns->ns_lock);