LU-73 kernel: remove wrong jbd2 commit timer patch

The bug that this patch was originally fixing (incorrectly rounding
down the jiffies timer, which might cause it to be skipped) was
fixed in the upstream kernel by using round_jiffies_up(), which
always moves the timer into the future.

Remove this patch entirely, since it is no longer needed.

Change-Id: I3b4f30e0565cf64b95fc87babf1f54a9ab190754
Signed-off-by: Andreas Dilger <adilger@whamcloud.com>
Reviewed-on: http://review.whamcloud.com/961
Tested-by: Hudson
Tested-by: Maloo <whamcloud.maloo@gmail.com>
Reviewed-by: Yang Sheng <ys@whamcloud.com>
Reviewed-by: Oleg Drokin <green@whamcloud.com>

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
deleted file mode 100644 (file)
index bf0a801..0000000
--- a/lustre/kernel_patches/patches/jbd2-commit-timer-no-jiffies-rounding-rhel6.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-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 b712583..e720c51 100644 (file)
--- a/lustre/kernel_patches/series/2.6-rhel6.series
+++ b/lustre/kernel_patches/series/2.6-rhel6.series
@@ -6,4 +6,3 @@ 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