From 001a2cf265eb2a69991fa683c14d417fb0b7a370 Mon Sep 17 00:00:00 2001 From: Bobi Jam Date: Fri, 25 Mar 2011 01:06:06 +0800 Subject: [PATCH] LU-73 RHEL6 support. Add kernel jbd2-commit-timer-no-jiffies-rounding-rhel6.patch. Change-Id: Ic0f49962ecb72b974a3e5d6225c2995e481c6783 Signed-off-by: Bobi Jam Reviewed-on: http://review.whamcloud.com/358 Tested-by: Hudson Reviewed-by: Johann Lombardi Reviewed-by: Oleg Drokin --- .../jbd2-commit-timer-no-jiffies-rounding-rhel6.patch | 13 +++++++++++++ lustre/kernel_patches/series/2.6-rhel6.series | 1 + 2 files changed, 14 insertions(+) create mode 100644 lustre/kernel_patches/patches/jbd2-commit-timer-no-jiffies-rounding-rhel6.patch 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 index 0000000..bf0a801 --- /dev/null +++ b/lustre/kernel_patches/patches/jbd2-commit-timer-no-jiffies-rounding-rhel6.patch @@ -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); diff --git a/lustre/kernel_patches/series/2.6-rhel6.series b/lustre/kernel_patches/series/2.6-rhel6.series index 5e014dc..70c320e 100644 --- a/lustre/kernel_patches/series/2.6-rhel6.series +++ b/lustre/kernel_patches/series/2.6-rhel6.series @@ -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 +jbd2-commit-timer-no-jiffies-rounding-rhel6.patch -- 1.8.3.1