Branch HEAD

Back out accidental commit

diff --git a/lustre/include/liblustre.h b/lustre/include/liblustre.h
index aec1470..40c042e 100644 (file)
--- a/lustre/include/liblustre.h
+++ b/lustre/include/liblustre.h
@@ -900,12 +900,4 @@ void posix_acl_release(struct posix_acl *acl)
 #include <lustre_export.h>
 #include <lustre_net.h>
 
-#ifndef FMODE_READ
-#define FMODE_READ MDS_FMODE_READ
-#endif
-
-#ifndef FMODE_WRITE
-#define FMODE_WRITE MDS_FMODE_WRITE
-#endif
-
 #endif

diff --git a/lustre/include/linux/lustre_user.h b/lustre/include/linux/lustre_user.h
index cc5a4f6..a549214 100644 (file)
--- a/lustre/include/linux/lustre_user.h
+++ b/lustre/include/linux/lustre_user.h
@@ -57,9 +57,6 @@ typedef struct stat64   lstat_t;
 #endif
 
 #ifndef LPU64
-#if !defined(BITS_PER_LONG) && defined(__WORDSIZE)
-#define BITS_PER_LONG __WORDSIZE
-#endif
 /* x86_64 defines __u64 as "long" in userspace, but "long long" in the kernel */
 #if defined(__x86_64__) && defined(__KERNEL__)
 # define LPU64 "%Lu"

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
index 2e0d417..4da2e72 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-i686.config
@@ -867,7 +867,7 @@ CONFIG_ACENIC=m
 CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
-CONFIG_E1000_DISABLE_PACKET_SPLIT=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_MYRI_SBUS is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config
index ff4b0d1..2e3bad9 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-ia64.config
@@ -716,7 +716,7 @@ CONFIG_ACENIC=m
 CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
-CONFIG_E1000_DISABLE_PACKET_SPLIT=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_MYRI_SBUS is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m

diff --git a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
index 0d9818a..c755460 100644 (file)
--- a/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
+++ b/lustre/kernel_patches/kernel_configs/kernel-2.4.21-rhel-2.4-x86_64.config
@@ -777,7 +777,7 @@ CONFIG_ACENIC=m
 CONFIG_DL2K=m
 CONFIG_E1000=m
 CONFIG_E1000_NAPI=y
-CONFIG_E1000_DISABLE_PACKET_SPLIT=y
+# CONFIG_E1000_DISABLE_PACKET_SPLIT is not set
 # CONFIG_MYRI_SBUS is not set
 CONFIG_NS83820=m
 CONFIG_HAMACHI=m

diff --git a/lustre/kernel_patches/series/vanilla-2.4.24 b/lustre/kernel_patches/series/vanilla-2.4.24
index e5b42d0..02b1603 100644 (file)
--- a/lustre/kernel_patches/series/vanilla-2.4.24
+++ b/lustre/kernel_patches/series/vanilla-2.4.24
@@ -47,3 +47,4 @@ fsprivate-2.4.patch
 nfsd_iallocsem.patch
 linux-2.4.24-jbd-handle-EIO.patch
 ext3-sector_t-overflow-2.4.patch
+nfs_export_kernel-getattr_on_lookup-2.4.patch