include/linux/obd_sim.h: renamed to obd_ext2.h

Configure: revert PCI, APIC checks (otherwise code won't compile after config)

diff --git a/lustre/include/linux/obd_class.h b/lustre/include/linux/obd_class.h
index 76b746c..50e4b68 100644 (file)
--- a/lustre/include/linux/obd_class.h
+++ b/lustre/include/linux/obd_class.h
@@ -6,7 +6,7 @@
 #include <linux/time.h>
 #include <linux/obd.h>
 
-#include <linux/obd_sim.h>
+#include <linux/obd_ext2.h>
 #include <linux/obd_snap.h>
 /* #include <linux/obd_fc.h> */
 #include <linux/obd_raid1.h>

diff --git a/lustre/include/linux/obd_sim.h b/lustre/include/linux/obd_ext2.h
similarity index 98%
rename from lustre/include/linux/obd_sim.h
rename to lustre/include/linux/obd_ext2.h
index c95fb04..50d23d0 100644 (file)
--- a/lustre/include/linux/obd_sim.h
+++ b/lustre/include/linux/obd_ext2.h
@@ -1,5 +1,5 @@
-#ifndef _OBD_SIM
-#define _OBD_SIM
+#ifndef _OBD_EXT2
+#define _OBD_EXT2
 
 #define OBD_EXT2_RUNIT           _IOWR('f', 61, long)
 
@@ -13,7 +13,7 @@ struct ext2_obd {
 extern struct obdfs_sb_info *obd_sbi;
 extern struct file_operations *obd_fso;
 
-/* obd_sim.c */
+/* ext2_obd.c */
 extern struct obd_ops ext2_obd_ops;
 inline long ext2_block_map (struct inode * inode, long block);
 

diff --git a/lustre/obdfs/rw.c b/lustre/obdfs/rw.c
index cb302ce..a122e04 100644 (file)
--- a/lustre/obdfs/rw.c
+++ b/lustre/obdfs/rw.c
@@ -29,7 +29,7 @@
 #include <linux/smp_lock.h>
 
 #include <linux/obd_support.h>
-#include <linux/obd_sim.h>
+#include <linux/obd_ext2.h>
 #include <linux/obdfs.h>
 
 int console_loglevel;
@@ -108,7 +108,6 @@ int obdfs_write_one_page(struct file *file, struct page *page, unsigned long off
        status = -EFAULT;
 
        if (bytes) {
-
                lock_kernel();
                status = obdfs_writepage(file->f_dentry, page);
                unlock_kernel();