diff options
| author | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 23:44:47 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2010-10-27 23:44:47 -0400 |
| commit | a107e5a3a473a2ea62bd5af24e11b84adf1486ff (patch) | |
| tree | d36c2cb38d8be88d4d75cdebc354aa140aa0e470 /fs/jbd2/transaction.c | |
| parent | e3e1288e86a07cdeb0aee5860a2dff111c6eff79 (diff) | |
| parent | a269029d0e2192046be4c07ed78a45022469ee4c (diff) | |
Merge branch 'next' into upstream-merge
Conflicts:
fs/ext4/inode.c
fs/ext4/mballoc.c
include/trace/events/ext4.h
Diffstat (limited to 'fs/jbd2/transaction.c')
| -rw-r--r-- | fs/jbd2/transaction.c | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index f3479d6e0a83..6bf0a242613e 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c | |||
| @@ -156,6 +156,7 @@ alloc_transaction: | |||
| 156 | */ | 156 | */ |
| 157 | repeat: | 157 | repeat: |
| 158 | read_lock(&journal->j_state_lock); | 158 | read_lock(&journal->j_state_lock); |
| 159 | BUG_ON(journal->j_flags & JBD2_UNMOUNT); | ||
| 159 | if (is_journal_aborted(journal) || | 160 | if (is_journal_aborted(journal) || |
| 160 | (journal->j_errno != 0 && !(journal->j_flags & JBD2_ACK_ERR))) { | 161 | (journal->j_errno != 0 && !(journal->j_flags & JBD2_ACK_ERR))) { |
| 161 | read_unlock(&journal->j_state_lock); | 162 | read_unlock(&journal->j_state_lock); |