From a828304ecf980e2c0105ea1279d6795fee0cb6e4 Mon Sep 17 00:00:00 2001 From: Arjan van de Ven Date: Sun, 10 Dec 2006 02:21:26 -0800 Subject: [PATCH] --- yaml --- r: 44016 b: refs/heads/master c: 44d306e1508fef6fa7a6eb15a1aba86ef68389a6 h: refs/heads/master v: v3 --- [refs] | 2 +- trunk/fs/jbd/transaction.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/[refs] b/[refs] index fee3b9e2d93a..46912f51d243 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 4c36a5dec25fb344ad76b11860da3a8b50bd1248 +refs/heads/master: 44d306e1508fef6fa7a6eb15a1aba86ef68389a6 diff --git a/trunk/fs/jbd/transaction.c b/trunk/fs/jbd/transaction.c index d38e0d575e48..cceaf57e3778 100644 --- a/trunk/fs/jbd/transaction.c +++ b/trunk/fs/jbd/transaction.c @@ -55,7 +55,7 @@ get_transaction(journal_t *journal, transaction_t *transaction) spin_lock_init(&transaction->t_handle_lock); /* Set up the commit timer for the new transaction. */ - journal->j_commit_timer.expires = transaction->t_expires; + journal->j_commit_timer.expires = round_jiffies(transaction->t_expires); add_timer(&journal->j_commit_timer); J_ASSERT(journal->j_running_transaction == NULL);