---

yaml --- r: 163639 b: refs/heads/master c: b1f485f h: refs/heads/master i: 163637: 8ca3d77 163635: 32447e5 163631: fbbd0b7 v: v3
git-mirror · Aug 11, 2009 · 6d055af · 6d055af
1 parent 7f5cdb3
commit 6d055af
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: c333e073b7bf76dc819a6b4ce6bef88ee5fa5e50
+refs/heads/master: b1f485f20eb9b02cc7d2009556287f3939d480cc
diff --git a/trunk/fs/jbd2/transaction.c b/trunk/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);