---

yaml --- r: 44016 b: refs/heads/master c: 44d306e h: refs/heads/master v: v3
git-mirror · Dec 10, 2006 · a828304 · a828304
1 parent 0628999
commit a828304
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git 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
@@ -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);