patch include/linux/fs.h fix for ipc/shm.c

From: John Cavan (john.cavan@sympatico.ca)
Date: Sun Mar 19 2000 - 17:53:56 EST


Somewhere between 2.3.99-pre1 and -pre2, fs.h was changed and the change
appears to break ipc/shm.c

I believe, and I may be incorrect (being, at best, a very amateur kernel
hacker), that this fixes it by restoring part of the older version of
fs.h to differentiate between modules and compiled in code:

--- linux/include/linux/fs.h.bak Sun Mar 19 17:24:43 2000
+++ linux/include/linux/fs.h Sun Mar 19 17:25:35 2000
@@ -731,6 +731,7 @@
        struct file_system_type * next;
 };
 
+#ifdef MODULE
 #define DECLARE_FSTYPE(var,type,read,flags) \
 struct file_system_type var = { \
        name: type, \
@@ -738,6 +739,14 @@
        fs_flags: flags, \
        owner: THIS_MODULE, \
 }
+#else
+#define DECLARE_FSTYPE(var,type,read,flags) \
+struct file_system_type var = { \
+ name: type, \
+ read_super: read, \
+ fs_flags: flags, \
+}
+#endif
 
 #define DECLARE_FSTYPE_DEV(var,type,read) \
        DECLARE_FSTYPE(var,type,read,FS_REQUIRES_DEV)

-- 
*********************************

Tell me and I may forget, Show me and I may remember, Involve me and I will understand.

*********************************

- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.rutgers.edu Please read the FAQ at http://www.tux.org/lkml/



This archive was generated by hypermail 2b29 : Thu Mar 23 2000 - 21:00:27 EST