From 8ed4467ccecb3f030f6c69a3e821547c9e1f6712 Mon Sep 17 00:00:00 2001
From: braam <braam>
Date: Wed, 28 Jul 1999 16:11:56 +0000
Subject: [PATCH] Fixed a spelling mistake: "symulated" --> "simulated"
(sym_obd etc).
Improved configuration scripts
Removed compiler warnings from re-defining ext2_error
---
lustre/include/linux/obdfs.h | 2 +-
lustre/include/linux/{sym_obd.h => sim_obd.h} | 15 ++++++++-------
lustre/obdclass/sysctl.c | 2 +-
lustre/obdfs/super.c | 2 +-
lustre/obdfs/sysctl.c | 2 +-
5 files changed, 12 insertions(+), 11 deletions(-)
rename lustre/include/linux/{sym_obd.h => sim_obd.h} (97%)
diff --git a/lustre/include/linux/obdfs.h b/lustre/include/linux/obdfs.h
index 0eb8d886e7..46df61cfc5 100644
--- a/lustre/include/linux/obdfs.h
+++ b/lustre/include/linux/obdfs.h
@@ -1,4 +1,4 @@
-#include <../obd/linux/sym_obd.h>
+#include <../obd/linux/sim_obd.h>
struct obdfs_sb_info {
diff --git a/lustre/include/linux/sym_obd.h b/lustre/include/linux/sim_obd.h
similarity index 97%
rename from lustre/include/linux/sym_obd.h
rename to lustre/include/linux/sim_obd.h
index be63d1eeb0..ad5dcc2b84 100755
--- a/lustre/include/linux/sym_obd.h
+++ b/lustre/include/linux/sim_obd.h
@@ -1,12 +1,12 @@
-#ifndef __LINUX_SYM_OBD_H
-#define __LINUX_SYM_OBD_H
+#ifndef __LINUX_SIM_OBD_H
+#define __LINUX_SIM_OBD_H
#include <linux/fs.h>
#include <linux/ext2_fs.h>
#include <linux/malloc.h>
#include <linux/vmalloc.h>
-#define SYM_OBD_DEBUG
+#define SIM_OBD_DEBUG
/*
* Debug code
@@ -29,7 +29,7 @@ extern int obd_print_entry;
#define D_IOCTL 1024 /* ioctl related information */
#define D_BLOCKS 2048 /* ext2 block allocation */
-#ifdef SYM_OBD_DEBUG
+#ifdef SIM_OBD_DEBUG
#define CDEBUG(mask, format, a...) \
do { \
if (obd_debug_level & mask) { \
@@ -45,13 +45,13 @@ extern int obd_print_entry;
if (obd_print_entry) \
printk("Process %d leaving %s\n", current->pid, __FUNCTION__)
-#else /* SYM_OBD_DEBUG */
+#else /* SIM_OBD_DEBUG */
# define CDEBUG ;
# define ENTRY ;
# define EXIT ;
-#endif /* SYM_OBD_DEBUG */
+#endif /* SIM_OBD_DEBUG */
@@ -222,6 +222,7 @@ int obd_ioctl (struct inode * inode, struct file * filp, unsigned int cmd,
/* super.c */
#define ext2_warning obd_warning
+#undef ext2_error
#define ext2_error obd_warning
#define ext2_panic obd_warning
@@ -256,4 +257,4 @@ extern struct inode_operations ext2_file_inode_operations;
/* super.c */
extern struct super_operations ext2_sops;
-#endif /* __LINUX_SYM_OBD_H */
+#endif /* __LINUX_SIM_OBD_H */
diff --git a/lustre/obdclass/sysctl.c b/lustre/obdclass/sysctl.c
index c221e7a43d..e36a48c607 100644
--- a/lustre/obdclass/sysctl.c
+++ b/lustre/obdclass/sysctl.c
@@ -11,7 +11,7 @@
#include <asm/uaccess.h>
#include <linux/utsname.h>
-#include <linux/sym_obd.h>
+#include <linux/sim_obd.h>
#include <linux/presto.h>
#include <linux/obd_psdev.h>
#include <linux/presto_upcall.h>
diff --git a/lustre/obdfs/super.c b/lustre/obdfs/super.c
index 7d61a06966..f7b21a1510 100644
--- a/lustre/obdfs/super.c
+++ b/lustre/obdfs/super.c
@@ -25,7 +25,7 @@
#include <linux/vmalloc.h>
#include <asm/segment.h>
-#include <../obd/linux/sym_obd.h>
+#include <../obd/linux/sim_obd.h>
#include <obdfs.h>
/* DEBUGGING! */
diff --git a/lustre/obdfs/sysctl.c b/lustre/obdfs/sysctl.c
index 5f4eca6146..006e34b355 100644
--- a/lustre/obdfs/sysctl.c
+++ b/lustre/obdfs/sysctl.c
@@ -11,7 +11,7 @@
#include <asm/uaccess.h>
#include <linux/utsname.h>
-#include <linux/sym_obd.h>
+#include <linux/sim_obd.h>
#include <linux/presto.h>
#include <linux/obd_psdev.h>
#include <linux/presto_upcall.h>
--
GitLab