zygo: fs/btrfs: make noise for EIO: the inline function in both necessary header...

diff --git a/fs/btrfs/compression.h b/fs/btrfs/compression.h
index 13a4dc0436c9d3072b401312b3d3bf82a789ae4e..295cec971107be7a93ceef220cd9d63473f19c34 100644 (file)
--- a/fs/btrfs/compression.h
+++ b/fs/btrfs/compression.h
@@ -19,6 +19,8 @@
 #ifndef __BTRFS_COMPRESSION_
 #define __BTRFS_COMPRESSION_
 
+#include "eieio.h"
+
 void btrfs_init_compress(void);
 void btrfs_exit_compress(void);
 

diff --git a/fs/btrfs/ctree.h b/fs/btrfs/ctree.h
index 26af6d9c36bc64bdf359ca27d681534887ea4b3f..4cdaee96bb68217366bd34cd9350dad06d5ad797 100644 (file)
--- a/fs/btrfs/ctree.h
+++ b/fs/btrfs/ctree.h
@@ -4244,12 +4244,6 @@ static inline int btrfs_test_is_dummy_root(struct btrfs_root *root)
        return 0;
 }
 
-static inline int eieio(const char *func, const char *file, int line)
-{
-       printk(KERN_INFO "EIO at %s %s:%d\n", func, file, line);
-       return EIO;
-}
-
-#define EIEIO (eieio(__FUNCTION__, __FILE__, __LINE__))
+#include "eieio.h"
 
 #endif

diff --git a/fs/btrfs/eieio.h b/fs/btrfs/eieio.h
new file mode 100644 (file)
index 0000000..b162d0c
--- /dev/null
+++ b/fs/btrfs/eieio.h
@@ -0,0 +1,9 @@
+#ifndef EIEIO
+static inline int eieio(const char *func, const char *file, int line)
+{
+       printk(KERN_INFO "EIO at %s %s:%d\n", func, file, line);
+       return EIO;
+}
+
+#define EIEIO (eieio(__FUNCTION__, __FILE__, __LINE__))
+#endif