Header changes needed to compile under 2.5 (compiled also with 2.4 to verify).

diff --git a/lustre/ldlm/l_lock.c b/lustre/ldlm/l_lock.c
index db072e0..2566280 100644 (file)
--- a/lustre/ldlm/l_lock.c
+++ b/lustre/ldlm/l_lock.c
@@ -28,7 +28,6 @@
 #include <linux/string.h>
 #include <linux/stat.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
 

diff --git a/lustre/llite/commit_callback.c b/lustre/llite/commit_callback.c
index 741c734..fbfb302 100644 (file)
--- a/lustre/llite/commit_callback.c
+++ b/lustre/llite/commit_callback.c
@@ -23,7 +23,7 @@
 #include <linux/module.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
-#include <linux/locks.h>
+#include <linux/smp_lock.h>
 #include <linux/kmod.h>
 #include <linux/quotaops.h>
 #include <asm/unistd.h>

diff --git a/lustre/llite/dcache.c b/lustre/llite/dcache.c
index 577d288..637a422 100644 (file)
--- a/lustre/llite/dcache.c
+++ b/lustre/llite/dcache.c
@@ -20,7 +20,7 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
+#include <linux/smp_lock.h>
 #include <linux/quotaops.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE

diff --git a/lustre/llite/dir.c b/lustre/llite/dir.c
index b9bcc38..633763c 100644 (file)
--- a/lustre/llite/dir.c
+++ b/lustre/llite/dir.c
@@ -30,7 +30,7 @@
 #include <linux/ext2_fs.h>
 #include <linux/pagemap.h>
 #include <linux/mm.h>
-#include <linux/locks.h>
+#include <linux/smp_lock.h>
 #include <asm/uaccess.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE

diff --git a/lustre/llite/namei.c b/lustre/llite/namei.c
index 8e35870..1b402c1 100644 (file)
--- a/lustre/llite/namei.c
+++ b/lustre/llite/namei.c
@@ -28,8 +28,9 @@
  */
 
 #include <linux/fs.h>
-#include <linux/locks.h>
-#include <linux/quotaops.h>
+#include <linux/smp_lock.h>
+#include <linux/highmem.h>
+#include <linux/pagemap.h>
 
 #define DEBUG_SUBSYSTEM S_LLITE
 

diff --git a/lustre/llite/rw.c b/lustre/llite/rw.c
index dff6bab..6e59134 100644 (file)
--- a/lustre/llite/rw.c
+++ b/lustre/llite/rw.c
@@ -13,7 +13,7 @@
 #include <linux/stat.h>
 #include <linux/iobuf.h>
 #include <linux/errno.h>
-#include <linux/locks.h>
+#include <linux/smp_lock.h>
 #include <linux/unistd.h>
 #include <linux/version.h>
 #include <asm/system.h>

diff --git a/lustre/llite/symlink.c b/lustre/llite/symlink.c
index 927d6b0..655574b 100644 (file)
--- a/lustre/llite/symlink.c
+++ b/lustre/llite/symlink.c
@@ -19,6 +19,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
+#include <linux/fs.h>
+#include <linux/mm.h>
+#include <linux/stat.h>
+
 #define DEBUG_SUBSYSTEM S_LLITE
 
 #include <linux/lustre_lite.h>

diff --git a/lustre/obdclass/class_obd.c b/lustre/obdclass/class_obd.c
index 17f4355..be7f50b 100644 (file)
--- a/lustre/obdclass/class_obd.c
+++ b/lustre/obdclass/class_obd.c
@@ -31,6 +31,7 @@
 #include <linux/init.h>
 #include <linux/list.h>
 #include <asm/io.h>
+#include <asm/ioctls.h>
 #include <asm/system.h>
 #include <asm/poll.h>
 #include <asm/uaccess.h>

diff --git a/lustre/obdclass/lprocfs.c b/lustre/obdclass/lprocfs.c
index 5166ee9..4aa6c94 100644 (file)
--- a/lustre/obdclass/lprocfs.c
+++ b/lustre/obdclass/lprocfs.c
@@ -43,6 +43,7 @@
 #include <linux/proc_fs.h>
 #include <linux/slab.h>
 #include <linux/types.h>
+#include <linux/string.h>
 
 #define DEBUG_SUBSYSTEM S_CLASS
 #define MAX_STRING_SIZE 100

diff --git a/lustre/obdecho/echo.c b/lustre/obdecho/echo.c
index b12fe4b..a126178 100644 (file)
--- a/lustre/obdecho/echo.c
+++ b/lustre/obdecho/echo.c
@@ -12,16 +12,17 @@
  * and Andreas Dilger <adilger@clusterfs.com>
  */
 
-static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.39 2002/10/15 23:25:10 shaver Exp $";
-#define OBDECHO_VERSION "$Revision: 1.39 $"
+static char rcsid[] __attribute ((unused)) = "$Id: echo.c,v 1.40 2002/10/18 21:19:57 adilger Exp $";
+#define OBDECHO_VERSION "$Revision: 1.40 $"
 
 #define EXPORT_SYMTAB
 
 #include <linux/version.h>
 #include <linux/module.h>
+#include <linux/highmem.h>
 #include <linux/fs.h>
 #include <linux/stat.h>
-#include <linux/locks.h>
+#include <linux/smp_lock.h>
 #include <linux/ext2_fs.h>
 #include <linux/quotaops.h>
 #include <linux/proc_fs.h>

diff --git a/lustre/obdfilter/filter.c b/lustre/obdfilter/filter.c
index 323b884..62f3954 100644 (file)
--- a/lustre/obdfilter/filter.c
+++ b/lustre/obdfilter/filter.c
@@ -17,6 +17,8 @@
 
 #include <linux/module.h>
 #include <linux/pagemap.h>
+#include <linux/fs.h>
+#include <linux/dcache.h>
 #include <linux/obd_class.h>
 #include <linux/lustre_dlm.h>
 #include <linux/obd_filter.h>
@@ -996,6 +998,10 @@ static inline void lustre_put_page(struct page *page)
         page_cache_release(page);
 }
 
+#ifndef PageUptodate
+#define PageUptodate(page) Page_Uptodate(page)
+#endif
+
 static struct page *
 lustre_get_page_read(struct inode *inode, unsigned long index)
 {
@@ -1008,7 +1014,7 @@ lustre_get_page_read(struct inode *inode, unsigned long index)
         if (!IS_ERR(page)) {
                 wait_on_page(page);
                 kmap(page);
-                if (!Page_Uptodate(page)) {
+                if (!PageUptodate(page)) {
                         CERROR("page index %lu not uptodate\n", index);
                         GOTO(err_page, rc = -EIO);
                 }