From e9abc351b5afb2ddd6136c733a106004f5ff7120 Mon Sep 17 00:00:00 2001
From: adilger <adilger>
Date: Thu, 14 Dec 2006 00:49:06 +0000
Subject: [PATCH] Merge b1_5 from b1_4 (20061213_1244) Quiet compiler warnings
 from -Wundef in libsysio. Some fixes to allow building/insmod on 2.4 kernels:
  - do_div() and other 64-bit divisions  - bit_spin_lock usage in
 lock_bitlock(), et. al. More fixes for bug 10991 (removal of ENOLCK). Fix
 test 77c from bug 11238. Add mxlnd support. Kernel patch updates. ldiskfs
 patch updates. Remove duplicate test_56 in sanity.sh, renumbering to avoid
 conflicts. Allow acceptance-small.sh to run without any reformats.

---
 libsysio/include/fs.h        | 2 +-
 libsysio/include/inode.h     | 2 +-
 libsysio/include/sysio-cmn.h | 2 +-
 libsysio/include/sysio.h     | 4 ++--
 4 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/libsysio/include/fs.h b/libsysio/include/fs.h
index 8c7e782..95eab24 100644
--- a/libsysio/include/fs.h
+++ b/libsysio/include/fs.h
@@ -167,6 +167,6 @@ extern struct filesys * _sysio_fs_new(struct filesys_ops *ops,
 				      unsigned mask,
 				      void *private);
 extern void _sysio_fs_gone(struct filesys *fs);
-#if ZERO_SUM_MEMORY
+#ifdef ZERO_SUM_MEMORY
 extern void _sysio_fssw_shutdown(void);
 #endif
diff --git a/libsysio/include/inode.h b/libsysio/include/inode.h
index a825faf..7b2b9c6 100644
--- a/libsysio/include/inode.h
+++ b/libsysio/include/inode.h
@@ -416,7 +416,7 @@ extern TAILQ_HEAD(inodes_head, inode) _sysio_inodes;
 extern TAILQ_HEAD(pnodes_head, pnode) _sysio_pnodes;
 
 extern int _sysio_i_init(void);
-#if ZERO_SUM_MEMORY
+#ifdef ZERO_SUM_MEMORY
 extern void _sysio_i_shutdown(void);
 #endif
 extern struct inode *_sysio_i_new(struct filesys *fs,
diff --git a/libsysio/include/sysio-cmn.h b/libsysio/include/sysio-cmn.h
index cd97756..07b3339 100644
--- a/libsysio/include/sysio-cmn.h
+++ b/libsysio/include/sysio-cmn.h
@@ -151,7 +151,7 @@ struct iovec;
 	} while(0) 
 
 /* Interface enter/leave hook functions  */
-#if SYSIO_TRACING
+#ifdef SYSIO_TRACING
 extern void *_sysio_entry_trace_q;
 extern void *_sysio_exit_trace_q;
 
diff --git a/libsysio/include/sysio.h b/libsysio/include/sysio.h
index 9d914b8..770d741 100644
--- a/libsysio/include/sysio.h
+++ b/libsysio/include/sysio.h
@@ -112,7 +112,7 @@ struct intnl_stat;
 
 struct pnode;
 
-#if DEFER_INIT_CWD
+#ifdef DEFER_INIT_CWD
 extern const char *_sysio_init_cwd;
 #endif
 
@@ -151,7 +151,7 @@ extern char * _sysio_get_args(char *buf, struct option_value_info *vec);
 
 extern time_t _sysio_local_time(void);
 
-#if SYSIO_TRACING
+#ifdef SYSIO_TRACING
 extern void _sysio_cprintf(const char *fmt, ...);
 #endif
 
-- 
1.8.3.1