libxfs: disambiguate xfs.h

There are two "xfs.h" header files in xfsprogs. include/xfs.h
contains the userspace API definitions for the platform and ioctl
interfaces. libxfs/xfs.h contains support infrastructure
to allow kernel code to compile in userspace. They have different
purposes, and so we need to disambiguate them so it is clear what
header files are being included in which files.

We can't change include/xfs.h as it is exported and installed into
/usr/include/xfs, and that means we have to rename the libxfs
internal header file. Rename this to "libxfs_priv.h" so it is clear
that it is private to libxfs, and update all the libxfs code to
include it.

Signed-off-by: Dave Chinner <dchinner@redhat.com>

diff --git a/libxfs/Makefile b/libxfs/Makefile
index 51b98ec6736c0daf4174d765582eea888b524890..df4e36910e9fd2cabe88df6546ca489cc815721c 100644 (file)
--- a/libxfs/Makefile
+++ b/libxfs/Makefile
@@ -15,10 +15,10 @@ PKGHFILES = xfs_fs.h \
        xfs_types.h
 
 # headers with build dependencies
-HFILES = xfs.h \
-       init.h \
+HFILES = init.h \
        crc32defs.h \
        crc32table.h \
+       libxfs_priv.h \
        xfs_dir2_priv.h \
 
 # headers installed in QA targets

diff --git a/libxfs/cache.c b/libxfs/cache.c
index 105d2f9769bb48df0e3d73682d62a42c1d4a2ce4..4753a1d788841dc2268b91de95228071f6722a99 100644 (file)
--- a/libxfs/cache.c
+++ b/libxfs/cache.c
@@ -22,7 +22,7 @@
 #include <unistd.h>
 #include <pthread.h>
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/init.c b/libxfs/init.c
index 42fa7af66dbceef637bc84639929b262c852caa3..6f404aaa85b4d6e90fbfbf8886d4f2e663961540 100644 (file)
--- a/libxfs/init.c
+++ b/libxfs/init.c
@@ -19,7 +19,7 @@
 #include <sys/stat.h>
 #include "init.h"
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/kmem.c b/libxfs/kmem.c
index c2b91fd9c05d2e037db09f274b54008da6b05cb1..6421304b08448ff4e256f8b44a754f4d67ce162b 100644 (file)
--- a/libxfs/kmem.c
+++ b/libxfs/kmem.c
@@ -1,6 +1,6 @@
 
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 
 /*
  * Simple memory interface

diff --git a/libxfs/xfs.h b/libxfs/libxfs_priv.h
similarity index 100%
rename from libxfs/xfs.h
rename to libxfs/libxfs_priv.h

diff --git a/libxfs/linux.c b/libxfs/linux.c
index f16a51c71325e633a9bca1e5b8579e0d55bc2646..885016a016734d71e50ee8e76c3c40d808a95e29 100644 (file)
--- a/libxfs/linux.c
+++ b/libxfs/linux.c
@@ -25,7 +25,7 @@
 #include <sys/ioctl.h>
 #include <sys/sysinfo.h>
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 
 int platform_has_uuid = 1;

diff --git a/libxfs/logitem.c b/libxfs/logitem.c
index 31d8005937264ef52849676c8b76ff7a41b6b799..ea85e72930c0d7ad932f4c0bbb1b6b2a91de220a 100644 (file)
--- a/libxfs/logitem.c
+++ b/libxfs/logitem.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/rdwr.c b/libxfs/rdwr.c
index aeaae45bec570ef09b397c7373918e0618e1022c..cb172064fb92f6839ead51ce5b71189a8e424396 100644 (file)
--- a/libxfs/rdwr.c
+++ b/libxfs/rdwr.c
@@ -17,7 +17,7 @@
  */
 
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "init.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
@@ -30,7 +30,7 @@
 #include "xfs_inode.h"
 #include "xfs_trans.h"
 
-#include <xfs/libxfs.h>                /* for now */
+#include <xfs/libxfs.h>                /* for LIBXFS_EXIT_ON_FAILURE */
 
 /*
  * Important design/architecture note:

diff --git a/libxfs/trans.c b/libxfs/trans.c
index 8d0eed7340fb85cc4dcfad4ab55306dc14d63318..885c5f4dcfb074fb0af6d8006bab90b4e5aad23f 100644 (file)
--- a/libxfs/trans.c
+++ b/libxfs/trans.c
@@ -17,7 +17,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/util.c b/libxfs/util.c
index 41cc155f4b5b5ce968bfd0d1aeee2d50f79cda6e..a6b1fd1f5ab11697877b71380100b1474e616fdf 100644 (file)
--- a/libxfs/util.c
+++ b/libxfs/util.c
@@ -16,7 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "init.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"

diff --git a/libxfs/xfs_alloc.c b/libxfs/xfs_alloc.c
index 15b4e1715dc54688fbecb164de83b076a6196934..23e3c5387503b40abf848e4ef885ff5f58d83719 100644 (file)
--- a/libxfs/xfs_alloc.c
+++ b/libxfs/xfs_alloc.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_alloc_btree.c b/libxfs/xfs_alloc_btree.c
index 20a072dd9c55de4e296741a7fd36af0ee025b931..7fd72af95b0b214cff1e2f1772a1151c2647eb3a 100644 (file)
--- a/libxfs/xfs_alloc_btree.c
+++ b/libxfs/xfs_alloc_btree.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_attr.c b/libxfs/xfs_attr.c
index 00a319bd60a9917740189c04d582e0d3753cce23..f8c24f6d89f1c1d1701b0dd4ae80564a72524d65 100644 (file)
--- a/libxfs/xfs_attr.c
+++ b/libxfs/xfs_attr.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_attr_leaf.c b/libxfs/xfs_attr_leaf.c
index 01173a743e855661e524437ce88fb468691b7c7a..200bd30c16f9f776857b3a4a80e8bf52ac479b18 100644 (file)
--- a/libxfs/xfs_attr_leaf.c
+++ b/libxfs/xfs_attr_leaf.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_attr_remote.c b/libxfs/xfs_attr_remote.c
index 356b2e00e09e38a283944ad7c486ef0ea0ca73c6..4f492c18cc8c9bfb13ffff5cf3a7d9a87ef03fd5 100644 (file)
--- a/libxfs/xfs_attr_remote.c
+++ b/libxfs/xfs_attr_remote.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_bmap.c b/libxfs/xfs_bmap.c
index 55a2a25e44d77c887c565698b2d847db6961d93e..e6d1e6c0d7becb4495f5e5a125ea28c7499acd49 100644 (file)
--- a/libxfs/xfs_bmap.c
+++ b/libxfs/xfs_bmap.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_bmap_btree.c b/libxfs/xfs_bmap_btree.c
index f1ad2f97976cfc2fb0c9cfff5fa69c9a221e894a..2fd04e0cd19a43d62a965865070357318a0ca619 100644 (file)
--- a/libxfs/xfs_bmap_btree.c
+++ b/libxfs/xfs_bmap_btree.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_btree.c b/libxfs/xfs_btree.c
index 6c460611d9147c43b468577112575007afcc1c51..203e7d20f07b19d981184bf300325cc027381731 100644 (file)
--- a/libxfs/xfs_btree.c
+++ b/libxfs/xfs_btree.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_da_btree.c b/libxfs/xfs_da_btree.c
index a7502aecb6fe3c68b2c65c6b55441e29702e417f..441bef4ec1d7949447ece2b2ef5ce1eb17f2e3d8 100644 (file)
--- a/libxfs/xfs_da_btree.c
+++ b/libxfs/xfs_da_btree.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_da_format.c b/libxfs/xfs_da_format.c
index 9d624a6229468f721beaba38826008492f325aa0..e4c37f94866efffd977a3e30c1194378f89ec498 100644 (file)
--- a/libxfs/xfs_da_format.c
+++ b/libxfs/xfs_da_format.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_dir2.c b/libxfs/xfs_dir2.c
index 9ad9540d4635ffe86a0b2f4fda6a26e0927cc2eb..2a42317ab2f192cc697e2098961db3b9a1070ee9 100644 (file)
--- a/libxfs/xfs_dir2.c
+++ b/libxfs/xfs_dir2.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_dir2_block.c b/libxfs/xfs_dir2_block.c
index d949c6363cd92b0f5b277b5562eb1f79e3c13bed..f061a99a3f11b31cd9fecfab044c015346b9aaca 100644 (file)
--- a/libxfs/xfs_dir2_block.c
+++ b/libxfs/xfs_dir2_block.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_dir2_data.c b/libxfs/xfs_dir2_data.c
index 3d13011ea771897fe24f6b38f9c8c3600414d654..609c097bb1e922745b3ddffab93e9dbe0768436a 100644 (file)
--- a/libxfs/xfs_dir2_data.c
+++ b/libxfs/xfs_dir2_data.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_dir2_leaf.c b/libxfs/xfs_dir2_leaf.c
index 4c813864e86905ce7f52ecfad73880c8f30d52ad..c2dba8a4e78b545acb3741c7d50fb9ffb5e7158c 100644 (file)
--- a/libxfs/xfs_dir2_leaf.c
+++ b/libxfs/xfs_dir2_leaf.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_dir2_node.c b/libxfs/xfs_dir2_node.c
index ecda1ddb2d3413627a8d71d1b2427ee02620b28e..3b71e9e514205ee3b25e4e1535d7430d9e813fe0 100644 (file)
--- a/libxfs/xfs_dir2_node.c
+++ b/libxfs/xfs_dir2_node.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_dir2_sf.c b/libxfs/xfs_dir2_sf.c
index f549afef034efc96d496b177ac04c98907fa6086..e4b505b8bfe557c72298eca8f0281612193eada8 100644 (file)
--- a/libxfs/xfs_dir2_sf.c
+++ b/libxfs/xfs_dir2_sf.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_dquot_buf.c b/libxfs/xfs_dquot_buf.c
index 85827985fab99eb88d0b2fd4d2177a3af496dc9e..2e0484a6fe48c57c2fdfaccbb34a92e634ff5e4c 100644 (file)
--- a/libxfs/xfs_dquot_buf.c
+++ b/libxfs/xfs_dquot_buf.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_ialloc.c b/libxfs/xfs_ialloc.c
index 841bde5e41a5ffac4eae057587885f503d3e33ef..2b4e4e0778662c098b4e08387a04b3fe6b98f6e2 100644 (file)
--- a/libxfs/xfs_ialloc.c
+++ b/libxfs/xfs_ialloc.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_ialloc_btree.c b/libxfs/xfs_ialloc_btree.c
index fd62c7f90959ffdc78e4deb5f05e0912f4d1b931..9ac143a5efe3fd39766481feb900dc2d549eb6cb 100644 (file)
--- a/libxfs/xfs_ialloc_btree.c
+++ b/libxfs/xfs_ialloc_btree.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_inode_buf.c b/libxfs/xfs_inode_buf.c
index 561fdd2f01b349b7bfd32911349adf5068f687c4..28085b3294cbf4863a49b1bfe8702f0b4b7d6b87 100644 (file)
--- a/libxfs/xfs_inode_buf.c
+++ b/libxfs/xfs_inode_buf.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_inode_fork.c b/libxfs/xfs_inode_fork.c
index 334ff86b4c651cf6d7c97704db139c27a54f58e1..e1968b43efd333408db812cef9087e938594ebf2 100644 (file)
--- a/libxfs/xfs_inode_fork.c
+++ b/libxfs/xfs_inode_fork.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_log_rlimit.c b/libxfs/xfs_log_rlimit.c
index c10597973333ce44487c4c1c6723dac4ed2d38a3..9264afa92d1e47d4c365d108946de8e931b1b421 100644 (file)
--- a/libxfs/xfs_log_rlimit.c
+++ b/libxfs/xfs_log_rlimit.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_rtbitmap.c b/libxfs/xfs_rtbitmap.c
index a4201566d6d568f9a9442d344f2161b3388b3b22..0054432c17329f7ac631a363287d98ea3d495a4e 100644 (file)
--- a/libxfs/xfs_rtbitmap.c
+++ b/libxfs/xfs_rtbitmap.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_sb.c b/libxfs/xfs_sb.c
index 60dc7ab7dd203bc5e23e393472e89961d8925df4..fdb3eafe9544228a3315db0a9b0e7573b41f3f34 100644 (file)
--- a/libxfs/xfs_sb.c
+++ b/libxfs/xfs_sb.c
@@ -15,7 +15,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"

diff --git a/libxfs/xfs_symlink_remote.c b/libxfs/xfs_symlink_remote.c
index aad3df8a1325b63569fbe64b871cc99d42ea0c07..6bc5af530373f3c924ea5fa4b56bc4e952a1d3d6 100644 (file)
--- a/libxfs/xfs_symlink_remote.c
+++ b/libxfs/xfs_symlink_remote.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_format.h"
 #include "xfs_log_format.h"

diff --git a/libxfs/xfs_trans_resv.c b/libxfs/xfs_trans_resv.c
index 2bb622da78e32c74b4ce7933727030b7dedc85ca..0c40b528de2b059fa4c69bd53463ec5191280dc8 100644 (file)
--- a/libxfs/xfs_trans_resv.c
+++ b/libxfs/xfs_trans_resv.c
@@ -16,7 +16,7 @@
  * along with this program; if not, write the Free Software Foundation,
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
-#include "xfs.h"
+#include "libxfs_priv.h"
 #include "xfs_fs.h"
 #include "xfs_shared.h"
 #include "xfs_format.h"