diff options
| author | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-01-22 16:49:20 +0700 |
|---|---|---|
| committer | Pawit Pornkitprasan <p.pawit@gmail.com> | 2013-01-22 16:49:57 +0700 |
| commit | 8a65ee9a2f9055ebc72e3a34206255129e3afb09 (patch) | |
| tree | 6cc78596a50734f52be0050972b2df36a5ea3be3 /fs/jbd2 | |
| parent | eedcf0c3ff0ab70b3a3a2ae7d73dcf334ea3c34e (diff) | |
| parent | d4184347012fbe705671037a4a0e4c7021ea4329 (diff) | |
| download | kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.zip kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.tar.gz kernel_samsung_aries-8a65ee9a2f9055ebc72e3a34206255129e3afb09.tar.bz2 | |
Merge 3.0.60
Change-Id: I00b211aba537823b54ad68971ebb9032a6bf78f7
Diffstat (limited to 'fs/jbd2')
| -rw-r--r-- | fs/jbd2/transaction.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 9baa39e..4ef2aae 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -178,7 +178,8 @@ repeat: if (!new_transaction) goto alloc_transaction; write_lock(&journal->j_state_lock); - if (!journal->j_running_transaction) { + if (!journal->j_running_transaction && + !journal->j_barrier_count) { jbd2_get_transaction(journal, new_transaction); new_transaction = NULL; } |