r=adilger

b=7000

Patch to 2.4 kernel patches in #if'ed out code by default.  See bug 7000 for all the details.

diff --git a/lustre/kernel_patches/patches/sd_iostats-2.4.21-chaos.patch b/lustre/kernel_patches/patches/sd_iostats-2.4.21-chaos.patch
index c8d2598..ad63bb4 100644 (file)
--- a/lustre/kernel_patches/patches/sd_iostats-2.4.21-chaos.patch
+++ b/lustre/kernel_patches/patches/sd_iostats-2.4.21-chaos.patch
@@ -74,7 +74,7 @@ diff -u -p -r1.1.1.1 sd.c
 +static inline void sd_iostats_init(void) {}
 +static inline void sd_iostats_init_disk(int disk) {}
 +static inline void sd_iostats_fini(void) {}
-+static inline void sd_iostats_bump(kdev_t dev, unsigned int nsect, int iswrite) {}
++static inline void sd_iostats_bump(int dev, unsigned int nsect, int iswrite) {}
 +#endif
 +
  /* device number --> sd_gendisks index */