From: Andreas Dilger Date: Tue, 11 Aug 2009 02:51:53 +0000 (-0400) Subject: jbd2: round commit timer up to avoid uncommitted transaction X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=b1f485f20eb9b02cc7d2009556287f3939d480cc;p=linux-beck.git jbd2: round commit timer up to avoid uncommitted transaction 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) Signed-off-by: Andreas Dilger Signed-off-by: "Theodore Ts'o" --- diff --git a/fs/jbd2/transaction.c b/fs/jbd2/transaction.c index 6213ac728f30..4516a87ca55c 100644 --- a/fs/jbd2/transaction.c +++ b/fs/jbd2/transaction.c @@ -57,7 +57,7 @@ jbd2_get_transaction(journal_t *journal, transaction_t *transaction) 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);