projects
/
cascardo
/
linux.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'fixes-for-linus-for-3.6-rc2' of git://git.linaro.org/people/mszyprowski...
[cascardo/linux.git]
/
fs
/
jbd2
/
journal.c
diff --git
a/fs/jbd2/journal.c
b/fs/jbd2/journal.c
index
e9a3c4c
..
8625da2
100644
(file)
--- a/
fs/jbd2/journal.c
+++ b/
fs/jbd2/journal.c
@@
-612,8
+612,8
@@
int jbd2_journal_start_commit(journal_t *journal, tid_t *ptid)
ret = 1;
} else if (journal->j_committing_transaction) {
/*
ret = 1;
} else if (journal->j_committing_transaction) {
/*
- * If
ext3_write_super() recently started a commit, then we
- *
have to wait for completion of that transaction
+ * If
commit has been started, then we have to wait for
+ *
completion of that transaction.
*/
if (ptid)
*ptid = journal->j_committing_transaction->t_tid;
*/
if (ptid)
*ptid = journal->j_committing_transaction->t_tid;