Whamcloud - gitweb
LU-73 RHEL6 support.
authorBobi Jam <bobijam@whamcloud.com>
Thu, 24 Mar 2011 17:06:06 +0000 (01:06 +0800)
committerOleg Drokin <green@whamcloud.com>
Fri, 25 Mar 2011 04:49:13 +0000 (21:49 -0700)
Add kernel jbd2-commit-timer-no-jiffies-rounding-rhel6.patch.

Change-Id: Ic0f49962ecb72b974a3e5d6225c2995e481c6783
Signed-off-by: Bobi Jam <bobijam@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/358
Tested-by: Hudson
Reviewed-by: Johann Lombardi <johann@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>
lustre/kernel_patches/patches/jbd2-commit-timer-no-jiffies-rounding-rhel6.patch [new file with mode: 0644]
lustre/kernel_patches/series/2.6-rhel6.series

diff --git a/lustre/kernel_patches/patches/jbd2-commit-timer-no-jiffies-rounding-rhel6.patch b/lustre/kernel_patches/patches/jbd2-commit-timer-no-jiffies-rounding-rhel6.patch
new file mode 100644 (file)
index 0000000..bf0a801
--- /dev/null
@@ -0,0 +1,13 @@
+Index: linux-2.6.32-71.18.1.el6-master/fs/jbd2/transaction.c
+===================================================================
+--- linux-2.6.32-71.18.1.el6-master.orig/fs/jbd2/transaction.c 2011-03-18 10:05:45.000000000 +0800
++++ linux-2.6.32-71.18.1.el6-master/fs/jbd2/transaction.c      2011-03-18 10:06:19.001935306 +0800
+@@ -59,7 +59,7 @@
+       INIT_LIST_HEAD(&transaction->t_private_list);
+       /* Set up the commit timer for the new transaction. */
+-      journal->j_commit_timer.expires = round_jiffies_up(transaction->t_expires);
++      journal->j_commit_timer.expires = transaction->t_expires;
+       add_timer(&journal->j_commit_timer);
+       J_ASSERT(journal->j_running_transaction == NULL);
index 5e014dc..70c320e 100644 (file)
@@ -5,3 +5,4 @@ dev_read_only-2.6.32-rhel6.patch
 blkdev_tunables-2.6-rhel6.patch
 export-2.6.32-vanilla.patch
 jbd2-jcberr-2.6-rhel6.patch
 blkdev_tunables-2.6-rhel6.patch
 export-2.6.32-vanilla.patch
 jbd2-jcberr-2.6-rhel6.patch
+jbd2-commit-timer-no-jiffies-rounding-rhel6.patch