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 branches 'core/futexes' and 'core/iommu' into core/urgent
[pandora-kernel.git]
/
fs
/
ocfs2
/
dlm
/
dlmast.c
diff --git
a/fs/ocfs2/dlm/dlmast.c
b/fs/ocfs2/dlm/dlmast.c
index
01cf8cc
..
dccc439
100644
(file)
--- a/
fs/ocfs2/dlm/dlmast.c
+++ b/
fs/ocfs2/dlm/dlmast.c
@@
-123,7
+123,7
@@
static void __dlm_queue_ast(struct dlm_ctxt *dlm, struct dlm_lock *lock)
dlm_lock_put(lock);
/* free up the reserved bast that we are cancelling.
* guaranteed that this will not be the last reserved
dlm_lock_put(lock);
/* free up the reserved bast that we are cancelling.
* guaranteed that this will not be the last reserved
- * ast because *both* an ast and a bast were reserved
+ * ast because *both* an ast and a bast were reserved
* to get to this point. the res->spinlock will not be
* taken here */
dlm_lockres_release_ast(dlm, res);
* to get to this point. the res->spinlock will not be
* taken here */
dlm_lockres_release_ast(dlm, res);