From 85daac3049a0075085d94d1b2916509a296ff8b5 Mon Sep 17 00:00:00 2001
From: ericm <ericm>
Date: Mon, 27 Feb 2006 21:43:11 +0000
Subject: [PATCH] branch: b1_5 - lift include/linux/lustre_ver.h to
 include/lustre_ver.h. - some other compile warning fixes.

---
 lustre/autoconf/lustre-core.m4             | 2 +-
 lustre/autoconf/lustre-version.ac          | 4 ++--
 lustre/include/.cvsignore                  | 1 +
 lustre/include/linux/.cvsignore            | 1 -
 lustre/include/linux/lustre_handles.h      | 1 +
 lustre/include/{linux => }/lustre_ver.h.in | 2 --
 lustre/ldlm/ldlm_lib.c                     | 2 +-
 lustre/liblustre/llite_lib.c               | 1 -
 lustre/liblustre/llite_lib.h               | 1 +
 lustre/liblustre/super.c                   | 1 -
 lustre/llite/llite_internal.h              | 2 +-
 lustre/lov/lov_obd.c                       | 2 +-
 lustre/mds/handler.c                       | 2 +-
 lustre/mds/mds_lov.c                       | 2 +-
 lustre/obdclass/class_obd.c                | 2 +-
 lustre/obdfilter/filter.c                  | 2 +-
 lustre/ptlrpc/import.c                     | 2 +-
 17 files changed, 14 insertions(+), 16 deletions(-)
 rename lustre/include/{linux => }/lustre_ver.h.in (96%)

diff --git a/lustre/autoconf/lustre-core.m4 b/lustre/autoconf/lustre-core.m4
index eae19cb..b436017 100644
--- a/lustre/autoconf/lustre-core.m4
+++ b/lustre/autoconf/lustre-core.m4
@@ -615,8 +615,8 @@ lustre/autoconf/Makefile
 lustre/conf/Makefile
 lustre/doc/Makefile
 lustre/include/Makefile
+lustre/include/lustre_ver.h
 lustre/include/linux/Makefile
-lustre/include/linux/lustre_ver.h
 lustre/include/lustre/Makefile
 lustre/kernel_patches/targets/2.6-suse.target
 lustre/kernel_patches/targets/2.6-vanilla.target
diff --git a/lustre/autoconf/lustre-version.ac b/lustre/autoconf/lustre-version.ac
index bc74354..5a2d2a0 100644
--- a/lustre/autoconf/lustre-version.ac
+++ b/lustre/autoconf/lustre-version.ac
@@ -1,6 +1,6 @@
 m4_define([LUSTRE_MAJOR],[1])
-m4_define([LUSTRE_MINOR],[4])
-m4_define([LUSTRE_PATCH],[6])
+m4_define([LUSTRE_MINOR],[5])
+m4_define([LUSTRE_PATCH],[1])
 m4_define([LUSTRE_FIX],[0])
 
 dnl # 288 stands for 0.0.1.32 , next version with fixes is ok, but next after
diff --git a/lustre/include/.cvsignore b/lustre/include/.cvsignore
index a8dd680..e2f4176 100644
--- a/lustre/include/.cvsignore
+++ b/lustre/include/.cvsignore
@@ -11,3 +11,4 @@ Makefile
 Makefile.in
 .deps
 TAGS
+lustre_ver.h
diff --git a/lustre/include/linux/.cvsignore b/lustre/include/linux/.cvsignore
index ee57167..b731c89 100644
--- a/lustre/include/linux/.cvsignore
+++ b/lustre/include/linux/.cvsignore
@@ -13,4 +13,3 @@ extN_jbd.h
 extN_xattr.h
 xattr.h
 lustre_build_version.h
-lustre_ver.h
diff --git a/lustre/include/linux/lustre_handles.h b/lustre/include/linux/lustre_handles.h
index 2f4fad9..21eb047 100644
--- a/lustre/include/linux/lustre_handles.h
+++ b/lustre/include/linux/lustre_handles.h
@@ -9,6 +9,7 @@
 #include <asm/types.h>
 #include <asm/atomic.h>
 #include <linux/list.h>
+#include <linux/random.h>
 #endif
 
 #endif
diff --git a/lustre/include/linux/lustre_ver.h.in b/lustre/include/lustre_ver.h.in
similarity index 96%
rename from lustre/include/linux/lustre_ver.h.in
rename to lustre/include/lustre_ver.h.in
index 4abf818..5881c4f 100644
--- a/lustre/include/linux/lustre_ver.h.in
+++ b/lustre/include/lustre_ver.h.in
@@ -1,8 +1,6 @@
 #ifndef _LUSTRE_VER_H_
 #define _LUSTRE_VER_H_
 
-#include <linux/lustre_idl.h>
-
 #define LUSTRE_MAJOR @AC_LUSTRE_MAJOR@
 #define LUSTRE_MINOR @AC_LUSTRE_MINOR@
 #define LUSTRE_PATCH @AC_LUSTRE_PATCH@
diff --git a/lustre/ldlm/ldlm_lib.c b/lustre/ldlm/ldlm_lib.c
index c7fd393..9724ea5 100644
--- a/lustre/ldlm/ldlm_lib.c
+++ b/lustre/ldlm/ldlm_lib.c
@@ -37,7 +37,7 @@
 #include <lustre_mds.h> /* for LUSTRE_MDC_NAME */
 #include <lustre_dlm.h>
 #include <lustre_net.h>
-#include <linux/lustre_ver.h>
+#include <lustre_ver.h>
 
 /* @priority: if non-zero, move the selected to the list head
  * @create: if zero, only search in existed connections
diff --git a/lustre/liblustre/llite_lib.c b/lustre/liblustre/llite_lib.c
index 21c50ec..b8450b8 100644
--- a/lustre/liblustre/llite_lib.c
+++ b/lustre/liblustre/llite_lib.c
@@ -48,7 +48,6 @@
 
 #include "lutil.h"
 #include "llite_lib.h"
-#include <linux/lustre_ver.h>
 
 static int lllib_init(void)
 {
diff --git a/lustre/liblustre/llite_lib.h b/lustre/liblustre/llite_lib.h
index fd8a92f..96979ee 100644
--- a/lustre/liblustre/llite_lib.h
+++ b/lustre/liblustre/llite_lib.h
@@ -10,6 +10,7 @@
 #include <obd_class.h>
 #include <lustre_mds.h>
 #include <lustre_lite.h>
+#include <lustre_ver.h>
 
 #include <sys/types.h>
 #include <sys/stat.h>
diff --git a/lustre/liblustre/super.c b/lustre/liblustre/super.c
index f6d2f08..dcf5bca 100644
--- a/lustre/liblustre/super.c
+++ b/lustre/liblustre/super.c
@@ -51,7 +51,6 @@
 #undef LIST_HEAD
 
 #include "llite_lib.h"
-#include <linux/lustre_ver.h>
 
 #ifndef MAY_EXEC
 #define MAY_EXEC        1
diff --git a/lustre/llite/llite_internal.h b/lustre/llite/llite_internal.h
index 3d904c7..7df9aa9 100644
--- a/lustre/llite/llite_internal.h
+++ b/lustre/llite/llite_internal.h
@@ -11,7 +11,7 @@
 #endif
 
 #include <lustre_debug.h>
-#include <linux/lustre_ver.h>
+#include <lustre_ver.h>
 
 /*
 struct lustre_intent_data {
diff --git a/lustre/lov/lov_obd.c b/lustre/lov/lov_obd.c
index f0a409f..e1e06b7 100644
--- a/lustre/lov/lov_obd.c
+++ b/lustre/lov/lov_obd.c
@@ -1882,7 +1882,7 @@ static int lov_join_lru(struct obd_export *exp,
         } while(0)
 
 static int lov_statfs(struct obd_device *obd, struct obd_statfs *osfs,
-                      unsigned long max_age)
+                      cfs_time_t max_age)
 {
         struct lov_obd *lov = &obd->u.lov;
         struct obd_statfs lov_sfs;
diff --git a/lustre/mds/handler.c b/lustre/mds/handler.c
index 759a836..aea7943 100644
--- a/lustre/mds/handler.c
+++ b/lustre/mds/handler.c
@@ -57,7 +57,7 @@
 #include <lprocfs_status.h>
 #include <lustre_commit_confd.h>
 #include <lustre_quota.h>
-#include <linux/lustre_ver.h>
+#include <lustre_ver.h>
 
 #include "mds_internal.h"
 
diff --git a/lustre/mds/mds_lov.c b/lustre/mds/mds_lov.c
index b392f14..4aa04fd 100644
--- a/lustre/mds/mds_lov.c
+++ b/lustre/mds/mds_lov.c
@@ -38,7 +38,7 @@
 #include <obd_lov.h>
 #include <lustre_lib.h>
 #include <lustre_fsfilt.h>
-#include <linux/lustre_ver.h>
+#include <lustre_ver.h>
 
 #include "mds_internal.h"
 
diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index f144fda..fc3f8fd 100644
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -41,9 +41,9 @@
 #include <lprocfs_status.h>
 #ifdef __KERNEL__
 #include <linux/lustre_build_version.h>
-#include <linux/lustre_ver.h>
 #endif
 #include <libcfs/list.h>
+#include <lustre_ver.h>
 #include "llog_internal.h"
 
 #ifndef __KERNEL__
diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 214b1ad..87c11eb 100644
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -57,7 +57,7 @@
 #include <lustre_commit_confd.h>
 #include <libcfs/list.h>
 #include <lustre_quota.h>
-#include <linux/lustre_ver.h>
+#include <lustre_ver.h>
 
 #include "filter_internal.h"
 
diff --git a/lustre/ptlrpc/import.c b/lustre/ptlrpc/import.c
index 45abef3..565d808 100644
--- a/lustre/ptlrpc/import.c
+++ b/lustre/ptlrpc/import.c
@@ -35,7 +35,7 @@
 #include <lustre_export.h>
 #include <obd.h>
 #include <obd_class.h>
-#include <linux/lustre_ver.h>
+#include <lustre_ver.h>
 
 #include "ptlrpc_internal.h"
 
-- 
1.8.3.1