From 93be3c4c56f052820e3aa4f9c8b452a92a78bc0d Mon Sep 17 00:00:00 2001 From: Andreas Dilger Date: Wed, 26 Oct 2011 01:37:59 -0600 Subject: [PATCH] LU-433 ldiskfs: fix up patch comment for 2.2 The LU-433 patch wasn't landed until 2.2, so this patch is at least needed to make 2.1->2.2 transition easier. Signed-off-by: Andreas Dilger Change-Id: Ia213ae92a8fe21f5153e22b588ff66c8f67439f2 Reviewed-on: http://review.whamcloud.com/1604 Reviewed-by: Bobi Jam Tested-by: Hudson Tested-by: Maloo Reviewed-by: Oleg Drokin --- lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch | 2 +- lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel6.patch | 2 +- lustre/kernel_patches/patches/jbd2-jcberr-2.6-sles11.patch | 5 +++++ 3 files changed, 7 insertions(+), 2 deletions(-) diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch index 5e11d38..4a57ec3 100644 --- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch +++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel5.patch @@ -1,4 +1,4 @@ -This patch is no longer needed for Lustre, since Lustre 2.1. It is kept +This patch is no longer needed for Lustre, since Lustre 2.2. It is kept in the kernel patch series for compatibility with older Lustre releases to simplify the upgrade process so that both the kernel and Lustre do not need to be upgraded at the same time. See Jira issue LU-433. diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel6.patch b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel6.patch index e15d750..310957b 100644 --- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel6.patch +++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-rhel6.patch @@ -1,4 +1,4 @@ -This patch is no longer needed for Lustre, since Lustre 2.1. It is kept +This patch is no longer needed for Lustre, since Lustre 2.2. It is kept in the kernel patch series for compatibility with older Lustre releases to simplify the upgrade process so that both the kernel and Lustre do not need to be upgraded at the same time. See Jira issue LU-433. diff --git a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-sles11.patch b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-sles11.patch index 18ba3e0..ee1f2df 100644 --- a/lustre/kernel_patches/patches/jbd2-jcberr-2.6-sles11.patch +++ b/lustre/kernel_patches/patches/jbd2-jcberr-2.6-sles11.patch @@ -1,3 +1,8 @@ +This patch is no longer needed for Lustre, since Lustre 2.2. It is kept +in the kernel patch series for compatibility with older Lustre releases +to simplify the upgrade process so that both the kernel and Lustre do +not need to be upgraded at the same time. See Jira issue LU-433. + Index: linux-2.6.27.21-0.1/include/linux/jbd2.h =================================================================== --- linux-2.6.27.21-0.1.orig/include/linux/jbd2.h -- 1.8.3.1