git.openpandora.org
/
pandora-kernel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
| inline |
side by side
Merge branch 'topic/oss' into for-linus
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
dlmast.c
diff --git
a/fs/ocfs2/dlm/dlmast.c
b/fs/ocfs2/dlm/dlmast.c
index
d07ddbe
..
81eff8e
100644
(file)
--- a/
fs/ocfs2/dlm/dlmast.c
+++ b/
fs/ocfs2/dlm/dlmast.c
@@
-103,7
+103,6
@@
static void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
lock->ast_pending, lock->ml.type);
BUG();
}
- BUG_ON(!list_empty(&lock->ast_list));
if (lock->ast_pending)
mlog(0, "lock has an ast getting flushed right now\n");