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 (file)
--- 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 (file)
--- 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__