merge b_devel to b_eq: 20030728

(4) mgmt obdclass obdfilter obdecho

diff --git a/lustre/mgmt/mgmt_cli.c b/lustre/mgmt/mgmt_cli.c
index 5ee9421..1ba8805 100644 (file)
--- a/lustre/mgmt/mgmt_cli.c
+++ b/lustre/mgmt/mgmt_cli.c
@@ -22,14 +22,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define EXPORT_SYMTAB
-
-/*
- *<phik> go back to your file and define S_MGMT to be S_FILTER
- *<phik> and then thank me for saving you four hours
- */
-
-#define DEBUG_SUBSYSTEM S_FILTER /* S_MGMT */
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_MGMT
 #include <linux/module.h>
 #include <linux/init.h>
 

diff --git a/lustre/mgmt/mgmt_svc.c b/lustre/mgmt/mgmt_svc.c
index 5b1046f..c638dfa 100644 (file)
--- a/lustre/mgmt/mgmt_svc.c
+++ b/lustre/mgmt/mgmt_svc.c
@@ -22,8 +22,10 @@
  *   Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
  */
 
-#define EXPORT_SYMTAB
-#define DEBUG_SUBSYSTEM S_FILTER
+#ifndef EXPORT_SYMTAB
+# define EXPORT_SYMTAB
+#endif
+#define DEBUG_SUBSYSTEM S_MGMT
 #include <linux/module.h>
 #include <linux/init.h>
 

diff --git a/lustre/obdclass/simple.c b/lustre/obdclass/simple.c
index 36ce7ba..a285fb7 100644 (file)
--- a/lustre/obdclass/simple.c
+++ b/lustre/obdclass/simple.c
@@ -33,6 +33,7 @@
 
 #include <linux/obd.h>
 #include <linux/lustre_lib.h>
+#include <linux/lustre_compat25.h>
 
 /* Debugging check only needed during development */
 #ifdef OBD_CTXT_DEBUG
@@ -179,7 +180,7 @@ struct dentry *simple_mknod(struct dentry *dir, char *name, int mode)
                 GOTO(out_up, dchild);
         }
 
-        err = vfs_create(dir->d_inode, dchild, (mode & ~S_IFMT) | S_IFREG);
+        err = ll_vfs_create(dir->d_inode, dchild, (mode & ~S_IFMT) | S_IFREG, NULL);
         if (err)
                 GOTO(out_err, err);