From: shaver <shaver>
Date: Wed, 21 May 2003 13:43:59 +0000 (+0000)
Subject: b=1301: don't perform our mdc_getstatus in ll_put_super if we're forcing the
X-Git-Tag: v1_7_100~1^91~254
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=0a9cfcc72d656ec342716451eb9251cd0d4e3ed2;p=fs%2Flustre-release.git

b=1301: don't perform our mdc_getstatus in ll_put_super if we're forcing the
        unmount.
b=1272: umount -f should only skip the disconnect RPCs if in recovery, to
        reduce the unfriendliness of gratuitous forces.
---

diff --git a/lnet/include/linux/kp30.h b/lnet/include/linux/kp30.h
index 4915fe3..46d9406 100644
--- a/lnet/include/linux/kp30.h
+++ b/lnet/include/linux/kp30.h
@@ -80,7 +80,7 @@ extern unsigned int portal_printk;
 #define D_RPCTRACE  (1 << 20) /* for distributed debugging */
 #define D_VFSTRACE  (1 << 21)
 
-#ifndef THREAD_SIZE
+#ifndef __KERNEL__
 #define THREAD_SIZE 8192
 #endif
 #ifdef  __arch_ia64__
diff --git a/lustre/portals/include/linux/kp30.h b/lustre/portals/include/linux/kp30.h
index 4915fe3..46d9406 100644
--- a/lustre/portals/include/linux/kp30.h
+++ b/lustre/portals/include/linux/kp30.h
@@ -80,7 +80,7 @@ extern unsigned int portal_printk;
 #define D_RPCTRACE  (1 << 20) /* for distributed debugging */
 #define D_VFSTRACE  (1 << 21)
 
-#ifndef THREAD_SIZE
+#ifndef __KERNEL__
 #define THREAD_SIZE 8192
 #endif
 #ifdef  __arch_ia64__