From: Johann Lombardi <johann@whamcloud.com>
Date: Tue, 28 Jun 2011 22:07:13 +0000 (+0200)
Subject: Revert "LU-457 Enable slab debug for RHEL5/x86_64"
X-Git-Tag: 1.8.6~1
X-Git-Url: https://git.whamcloud.com/gitweb?a=commitdiff_plain;h=a0375b393ef34c457bec68835ed6ac2f37b5a537;p=fs%2Flustre-release.git

Revert "LU-457 Enable slab debug for RHEL5/x86_64"

This reverts commit 529529a3dfbb8849f479c15f75e8f875ba5427b4.

Change-Id: Ic1955242ca260d9669a7e2ad4ba4d78f512739ce
Signed-off-by: Johann Lombardi <johann@whamcloud.com>
---

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
index 8c8c013..e7c66da 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64-smp.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.18-prep
-# Fri Jun 24 19:07:03 2011
+# Tue Jun 22 23:40:18 2010
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -45,8 +45,7 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
 CONFIG_CPUSETS=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -1089,8 +1088,8 @@ CONFIG_SCSI_PROC_FS=y
 # SCSI support type (disk, tape, CD-ROM)
 #
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
 CONFIG_SD_IOSTATS=y
+CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
@@ -3072,8 +3071,7 @@ CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHEDSTATS=y
-CONFIG_DEBUG_SLAB=y
-# CONFIG_DEBUG_SLAB_LEAK is not set
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
index 8e5f08c..d800674 100644
--- a/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.6.18-2.6-rhel5-x86_64.config
@@ -1,7 +1,7 @@
 #
 # Automatically generated make config: don't edit
 # Linux kernel version: 2.6.18-prep
-# Fri Jun 24 21:54:18 2011
+# Fri Apr 22 16:56:14 2011
 #
 CONFIG_X86_64=y
 CONFIG_64BIT=y
@@ -45,8 +45,7 @@ CONFIG_TASK_DELAY_ACCT=y
 CONFIG_TASK_IO_ACCOUNTING=y
 CONFIG_AUDIT=y
 CONFIG_AUDITSYSCALL=y
-CONFIG_IKCONFIG=y
-CONFIG_IKCONFIG_PROC=y
+# CONFIG_IKCONFIG is not set
 CONFIG_CPUSETS=y
 CONFIG_RELAY=y
 CONFIG_INITRAMFS_SOURCE=""
@@ -1090,8 +1089,8 @@ CONFIG_SCSI_PROC_FS=y
 # SCSI support type (disk, tape, CD-ROM)
 #
 CONFIG_BLK_DEV_SD=m
-CONFIG_CHR_DEV_ST=m
 CONFIG_SD_IOSTATS=y
+CONFIG_CHR_DEV_ST=m
 CONFIG_CHR_DEV_OSST=m
 CONFIG_BLK_DEV_SR=m
 CONFIG_BLK_DEV_SR_VENDOR=y
@@ -3085,8 +3084,7 @@ CONFIG_DETECT_HUNG_TASK=y
 # CONFIG_BOOTPARAM_HUNG_TASK_PANIC is not set
 CONFIG_BOOTPARAM_HUNG_TASK_PANIC_VALUE=0
 CONFIG_SCHEDSTATS=y
-CONFIG_DEBUG_SLAB=y
-# CONFIG_DEBUG_SLAB_LEAK is not set
+# CONFIG_DEBUG_SLAB is not set
 # CONFIG_DEBUG_RT_MUTEXES is not set
 # CONFIG_RT_MUTEX_TESTER is not set
 # CONFIG_DEBUG_SPINLOCK is not set
diff --git a/lustre/kernel_patches/patches/md-avoid-bug_on-when-bmc-overflow.patch b/lustre/kernel_patches/patches/md-avoid-bug_on-when-bmc-overflow.patch
index 3ca45b3..f64557e 100644
--- a/lustre/kernel_patches/patches/md-avoid-bug_on-when-bmc-overflow.patch
+++ b/lustre/kernel_patches/patches/md-avoid-bug_on-when-bmc-overflow.patch
@@ -11,8 +11,8 @@ diff .prev/drivers/md/bitmap.c ./drivers/md/bitmap.c
 +			 * after the test as long as we do it before dropping
 +			 * the spinlock.
 +			 */
-+			prepare_to_wait(&bitmap->overflow_wait,
-+					&__wait, TASK_UNINTERRUPTIBLE);
++			prepare_to_wait(&bitmap->overflow_wait, &__wait,
++					TASK_UNINTERRUPTIBLE);
 +			spin_unlock_irq(&bitmap->lock);
 +			bitmap->mddev->queue
 +				->unplug_fn(bitmap->mddev->queue);
diff --git a/lustre/mds/mds_open.c b/lustre/mds/mds_open.c
index 8e2e031..8ff4860 100644
--- a/lustre/mds/mds_open.c
+++ b/lustre/mds/mds_open.c
@@ -1689,7 +1689,7 @@ int mds_close(struct ptlrpc_request *req, int offset)
         mfd = mds_handle2mfd(&body->handle);
         if (mfd == NULL) {
                 spin_unlock(&med->med_open_lock);
-                DEBUG_REQ(D_INFO, req, "no handle for file close ino "LPD64
+                DEBUG_REQ(D_ERROR, req, "no handle for file close ino "LPD64
                           ": cookie "LPX64, body->fid1.id, body->handle.cookie);
                 req->rq_status = -ESTALE;
                 GOTO(cleanup, rc = -ESTALE);