Code Review
/
kvmfornfv.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
review
|
tree
raw
|
inline
| side by side
Upgrade to 4.4.50-rt62
[kvmfornfv.git]
/
kernel
/
fs
/
ocfs2
/
dlm
/
dlmrecovery.c
diff --git
a/kernel/fs/ocfs2/dlm/dlmrecovery.c
b/kernel/fs/ocfs2/dlm/dlmrecovery.c
index
42f0cae
..
4a33880
100644
(file)
--- a/
kernel/fs/ocfs2/dlm/dlmrecovery.c
+++ b/
kernel/fs/ocfs2/dlm/dlmrecovery.c
@@
-2064,7
+2064,6
@@
void dlm_move_lockres_to_recovery_list(struct dlm_ctxt *dlm,
dlm_lock_get(lock);
if (lock->convert_pending) {
/* move converting lock back to granted */
dlm_lock_get(lock);
if (lock->convert_pending) {
/* move converting lock back to granted */
- BUG_ON(i != DLM_CONVERTING_LIST);
mlog(0, "node died with convert pending "
"on %.*s. move back to granted list.\n",
res->lockname.len, res->lockname.name);
mlog(0, "node died with convert pending "
"on %.*s. move back to granted list.\n",
res->lockname.len, res->lockname.name);