diff options
| author | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 14:03:52 -0500 |
|---|---|---|
| committer | Marc Zyngier <marc.zyngier@arm.com> | 2013-02-11 14:03:52 -0500 |
| commit | 9ae9e2535d7dd1c21d6a7db1a7f2fc507a5e4080 (patch) | |
| tree | f059571830a159f05b8cdf4ec354b01ca7d6bc45 /fs/jbd/journal.c | |
| parent | 75431f9d7335daf7fb9e72b3a1539ce610142618 (diff) | |
| parent | 9e02e394c7d7fdc2570a73fb7fc6da3c79f6db2a (diff) | |
Merge branch 'for-arm-soc/arch-timers' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux into kvm-arm/timer
Diffstat (limited to 'fs/jbd/journal.c')
| -rw-r--r-- | fs/jbd/journal.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/fs/jbd/journal.c b/fs/jbd/journal.c index a2862339323b..81cc7eaff863 100644 --- a/fs/jbd/journal.c +++ b/fs/jbd/journal.c | |||
| @@ -446,7 +446,8 @@ int __log_start_commit(journal_t *journal, tid_t target) | |||
| 446 | * currently running transaction (if it exists). Otherwise, | 446 | * currently running transaction (if it exists). Otherwise, |
| 447 | * the target tid must be an old one. | 447 | * the target tid must be an old one. |
| 448 | */ | 448 | */ |
| 449 | if (journal->j_running_transaction && | 449 | if (journal->j_commit_request != target && |
| 450 | journal->j_running_transaction && | ||
| 450 | journal->j_running_transaction->t_tid == target) { | 451 | journal->j_running_transaction->t_tid == target) { |
| 451 | /* | 452 | /* |
| 452 | * We want a new commit: OK, mark the request and wakeup the | 453 | * We want a new commit: OK, mark the request and wakeup the |