Branch HEAD

Include ctype.h header to quiet warning for use of isdigit().
Change argument of loadgen.c::read_proc() to quiet pointer type warning.

diff --git a/lustre/utils/lfs.c b/lustre/utils/lfs.c
index 05f2919..9da7353 100644 (file)
--- a/lustre/utils/lfs.c
+++ b/lustre/utils/lfs.c
@@ -37,6 +37,7 @@
 #include <fcntl.h>
 #include <dirent.h>
 #include <time.h>
+#include <ctype.h>
 
 #include <lnet/api-support.h>
 #include <lnet/lnetctl.h>

diff --git a/lustre/utils/loadgen.c b/lustre/utils/loadgen.c
index d691e36..4ba3dcd 100644 (file)
--- a/lustre/utils/loadgen.c
+++ b/lustre/utils/loadgen.c
@@ -248,7 +248,7 @@ static int write_proc(char *proc_path, char *value)
         return rc;
 }
 
-static int read_proc(char *proc_path, long long *value)
+static int read_proc(char *proc_path, unsigned long long *value)
 {
         int fd, rc;
         char buf[50];

diff --git a/lustre/utils/module_setup.sh b/lustre/utils/module_setup.sh
index 07c64ee..0180a00 100755 (executable)
--- a/lustre/utils/module_setup.sh
+++ b/lustre/utils/module_setup.sh
@@ -3,16 +3,20 @@
 MDIR=/lib/modules/`uname -r`/lustre
 mkdir -p $MDIR
 
-KVER=24
-EXT=o
-FSFLT=fsfilt_ext3
-MODFILE="/etc/modules.conf"
-if [ `uname -r | cut -c 3` -eq 6 ]; then
-    KVER=26
-    EXT=ko
-    FSFLT=fsfilt_ldiskfs
+KVER=26
+EXT=ko
+FSFLT=fsfilt_ldiskfs
+if [ -d /etc/modprobe.d ]; then
+    MODFILE="/etc/modprobe.d/Lustre"
+else
     MODFILE="/etc/modprobe.conf"
 fi
+if [ `uname -r | cut -c 3` -eq 4 ]; then
+    KVER=24
+    EXT=o
+    FSFLT=fsfilt_ext3
+    MODFILE="/etc/modules.conf"
+fi
 
 echo "Copying modules from local build dir to "$MDIR