From 4920838cc75adb65fe3b1c8fadb475ef7ef3d4a0 Mon Sep 17 00:00:00 2001 From: Johann Lombardi Date: Thu, 21 Oct 2010 14:27:41 +0200 Subject: [PATCH] Revert "b=23988 Changes sd-iostats patch for 2.6.32 kernel." This reverts commit 50a915fdbb340f04a850778870d027c4c3303aab. --- ....32-vanilla.patch => sd_iostats-2.6.27-vanilla.patch} | 16 ++++++++-------- lustre/kernel_patches/series/2.6-sles11.series | 2 +- 2 files changed, 9 insertions(+), 9 deletions(-) rename lustre/kernel_patches/patches/{sd_iostats-2.6.32-vanilla.patch => sd_iostats-2.6.27-vanilla.patch} (98%) diff --git a/lustre/kernel_patches/patches/sd_iostats-2.6.32-vanilla.patch b/lustre/kernel_patches/patches/sd_iostats-2.6.27-vanilla.patch similarity index 98% rename from lustre/kernel_patches/patches/sd_iostats-2.6.32-vanilla.patch rename to lustre/kernel_patches/patches/sd_iostats-2.6.27-vanilla.patch index 42fe0e0..cf65da2 100644 --- a/lustre/kernel_patches/patches/sd_iostats-2.6.32-vanilla.patch +++ b/lustre/kernel_patches/patches/sd_iostats-2.6.27-vanilla.patch @@ -61,14 +61,14 @@ Index: linux-2.6.27.21-0.1/drivers/scsi/sd.c mempool_t *sd_cdb_pool; @@ -571,6 +589,8 @@ - */ - ret = BLKPREP_OK; - out: -+ if (ret == BLKPREP_OK) -+ sd_iostats_start_req(SCpnt); - return scsi_prep_return(q, rq, ret); - } - + if (host_dif || scsi_prot_sg_count(SCpnt)) + sd_prot_op(SCpnt, host_dif); + ++ sd_iostats_start_req(SCpnt); ++ + /* + * We shouldn't disconnect in the middle of a sector, so with a dumb + * host adapter, it's safe to assume that we can at least transfer @@ -1091,6 +1111,7 @@ break; } diff --git a/lustre/kernel_patches/series/2.6-sles11.series b/lustre/kernel_patches/series/2.6-sles11.series index 8405f1e..7160e40 100644 --- a/lustre/kernel_patches/series/2.6-sles11.series +++ b/lustre/kernel_patches/series/2.6-sles11.series @@ -5,7 +5,7 @@ export-truncate-2.6.18-vanilla.patch dev_read_only-2.6.27-vanilla.patch export-2.6.27-vanilla.patch export-show_task-2.6.27-vanilla.patch -sd_iostats-2.6.32-vanilla.patch +sd_iostats-2.6.27-vanilla.patch md-mmp-unplug-dev-sles11.patch quota-support-64-bit-quota-format.patch jbd2-jcberr-2.6-sles11.patch -- 1.8.3.1