From 6d055af18468bf51fce3cb323785d95936a98cc5 Mon Sep 17 00:00:00 2001
From: Andreas Dilger <adilger@sun.com>
Date: Mon, 10 Aug 2009 22:51:53 -0400
Subject: [PATCH] --- yaml --- r: 163639 b: refs/heads/master c:
 b1f485f20eb9b02cc7d2009556287f3939d480cc h: refs/heads/master i:   163637:
 8ca3d772687b506a6f56fac3349edb3d16573854   163635:
 32447e5e67a04272a34040270a7129efbfc80f4b   163631:
 fbbd0b74d1e9d544c85e414f516eb640633c730a v: v3

---
 [refs]                      | 2 +-
 trunk/fs/jbd2/transaction.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index ec3b6bc941d5..e7a4117a9718 100644
--- 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
index 6213ac728f30..4516a87ca55c 100644
--- 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);