| From e32c5e90d8b7cf1370c15db75245dab7135db931 Mon Sep 17 00:00:00 2001 |
| From: Andreas Dilger <adilger@sun.com> |
| Date: Mon, 10 Aug 2009 22:51:53 -0400 |
| Subject: [PATCH 04/85] jbd2: round commit timer up to avoid uncommitted transaction |
| |
| (cherry picked from commit b1f485f20eb9b02cc7d2009556287f3939d480cc) |
| |
| fix jiffie rounding in jbd commit timer setup code. Rounding down |
| could cause the timer to be fired before the corresponding transaction |
| has expired. That transaction can stay not committed forever if no |
| new transaction is created or expicit sync/umount happens. |
| |
| Signed-off-by: Alex Zhuravlev (Tomas) <alex.zhuravlev@sun.com> |
| Signed-off-by: Andreas Dilger <adilger@sun.com> |
| Signed-off-by: "Theodore Ts'o" <tytso@mit.edu> |
| Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de> |
| --- |
| fs/jbd2/transaction.c | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| --- a/fs/jbd2/transaction.c |
| +++ b/fs/jbd2/transaction.c |
| @@ -57,7 +57,7 @@ jbd2_get_transaction(journal_t *journal, |
| INIT_LIST_HEAD(&transaction->t_private_list); |
| |
| /* Set up the commit timer for the new transaction. */ |
| - journal->j_commit_timer.expires = round_jiffies(transaction->t_expires); |
| + journal->j_commit_timer.expires = round_jiffies_up(transaction->t_expires); |
| add_timer(&journal->j_commit_timer); |
| |
| J_ASSERT(journal->j_running_transaction == NULL); |
