---

yaml --- r: 77918 b: refs/heads/master c: db857da h: refs/heads/master v: v3
git-mirror · Jan 29, 2008 · 52c154a · 52c154a
1 parent 4a1f9e6
commit 52c154a
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: 77160957e29e9413f7420e85fca37a47d4ffac7f
+refs/heads/master: db857da3369cd4eb6a28be1cce89d33162caa4a0
diff --git a/trunk/fs/jbd2/transaction.c b/trunk/fs/jbd2/transaction.c
@@ -54,7 +54,7 @@ jbd2_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);