ChangeLog, jfs.h, jfs_compat.h:

  jfs.h: Move prototypes outside of the KERNEL #ifdef.  Remove
  	indentation in front of #define.
  jfs_compat.h: Add #include of netinet/in.h for htonl, and not to use
  	inline functions if compiling with gcc -Wall.

3 files changed, 30 insertions, 8 deletions

diff --git a/include/linux/ChangeLog b/include/linux/ChangeLog
index 531ac410..a65cd20f 100644
--- a/include/linux/ChangeLog
+++ b/include/linux/ChangeLog
@@ -1,3 +1,11 @@
+2001-01-05    <tytso@snap.thunk.org>
+
+	* jfs.h: Move prototypes outside of the KERNEL #ifdef.  Remove
+		indentation in front of #define.
+
+	* jfs_compat.h: Add #include of netinet/in.h for htonl, and not to
+		use inline functions if compiling with gcc -Wall.
+
 2000-12-30    <tytso@snap.thunk.org>
 
 	* ext2_fs.h (EXT3_JOURNAL_DATA_FL): Add new inode flag definition.
diff --git a/include/linux/jfs.h b/include/linux/jfs.h
index 48437717..739b6c52 100644
--- a/include/linux/jfs.h
+++ b/include/linux/jfs.h
@@ -578,7 +578,6 @@ extern int	   journal_set_features
 extern int	   journal_create     (journal_t *);
 extern int	   journal_load       (journal_t *);
 extern void	   journal_release    (journal_t *);
-extern int	   journal_recover    (journal_t *);
 extern int	   journal_wipe       (journal_t *, int);
 extern int	   journal_skip_recovery (journal_t *);
 extern void	   journal_update_superblock (journal_t *, int);
@@ -590,16 +589,10 @@ extern int	   journal_clear_err  (journal_t *);
 
 /* Primary revoke support */
 #define JOURNAL_REVOKE_DEFAULT_HASH 256
-extern int	   journal_init_revoke(journal_t *, int);
-extern void	   journal_destroy_revoke(journal_t *);
 extern int	   journal_revoke (handle_t *, unsigned long, struct buffer_head *);
 extern void	   journal_cancel_revoke(handle_t *, struct buffer_head *);
 extern void	   journal_write_revoke_records(journal_t *, transaction_t *);
 
-/* Recovery revoke support */
-extern int	   journal_set_revoke(journal_t *, unsigned long, tid_t);
-extern int	   journal_test_revoke(journal_t *, unsigned long, tid_t);
-extern void	   journal_clear_revoke(journal_t *);
 
 
 /* The log thread user interface:
@@ -644,7 +637,7 @@ static inline int is_journal_abort(journal_t *journal)
 
 /* Not all architectures define BUG() */
 #ifndef BUG
- #define BUG() do { \
+# define BUG() do { \
         printk("kernel BUG at %s:%d!\n", __FILE__, __LINE__); \
 	* ((char *) 0) = 0; \
  } while (0)
@@ -652,6 +645,19 @@ static inline int is_journal_abort(journal_t *journal)
 
 #endif /* __KERNEL__   */
 
+/* Function prototypes, used by both user- and kernel- space */
+
+/* recovery.c */
+extern int	   journal_recover    (journal_t *);
+
+/* revoke.c */
+extern int	   journal_init_revoke(journal_t *, int);
+extern int	   journal_set_revoke(journal_t *, unsigned long, tid_t);
+extern int	   journal_test_revoke(journal_t *, unsigned long, tid_t);
+extern void	   journal_clear_revoke(journal_t *);
+extern void	   journal_destroy_revoke(journal_t *);
+
+
 /* Comparison functions for transaction IDs: perform comparisons using
  * modulo arithmetic so that they work over sequence number wraps. */
 
diff --git a/include/linux/jfs_compat.h b/include/linux/jfs_compat.h
index 8d87753b..1318198c 100644
--- a/include/linux/jfs_compat.h
+++ b/include/linux/jfs_compat.h
@@ -4,6 +4,9 @@
 
 #include <linux/list.h>
 #include <errno.h>
+#ifdef HAVE_NETINET_IN_H
+#include <netinet/in.h>
+#endif
 
 #define printk printf
 #define KERN_ERR ""
@@ -53,4 +56,9 @@ struct journal_s
 
 #define is_journal_abort(x) 0
 
+/* Need this so we can compile with configure --enable-gcc-wall */
+#ifdef NO_INLINE_FUNCS
+#define inline
+#endif
+
 #endif /* _JFS_COMPAT_H */