]> git.ipfire.org Git - thirdparty/xfsprogs-dev.git/commitdiff
libxfs: disambiguate xfs.h
authorDave Chinner <dchinner@redhat.com>
Thu, 18 Dec 2014 23:51:22 +0000 (10:51 +1100)
committerDave Chinner <david@fromorbit.com>
Thu, 18 Dec 2014 23:51:22 +0000 (10:51 +1100)
There are two "xfs.h" header files in xfsprogs. include/xfs.h
contains the userspace API definitions for the platform and ioctl
interfaces. libxfs/support/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>
36 files changed:
libxfs/Makefile
libxfs/support/cache.c
libxfs/support/init.c
libxfs/support/kmem.c
libxfs/support/libxfs_priv.h [moved from libxfs/support/xfs.h with 100% similarity]
libxfs/support/linux.c
libxfs/support/logitem.c
libxfs/support/rdwr.c
libxfs/support/trans.c
libxfs/support/util.c
libxfs/xfs_alloc.c
libxfs/xfs_alloc_btree.c
libxfs/xfs_attr.c
libxfs/xfs_attr_leaf.c
libxfs/xfs_attr_remote.c
libxfs/xfs_bmap.c
libxfs/xfs_bmap_btree.c
libxfs/xfs_btree.c
libxfs/xfs_da_btree.c
libxfs/xfs_da_format.c
libxfs/xfs_dir2.c
libxfs/xfs_dir2_block.c
libxfs/xfs_dir2_data.c
libxfs/xfs_dir2_leaf.c
libxfs/xfs_dir2_node.c
libxfs/xfs_dir2_sf.c
libxfs/xfs_dquot_buf.c
libxfs/xfs_ialloc.c
libxfs/xfs_ialloc_btree.c
libxfs/xfs_inode_buf.c
libxfs/xfs_inode_fork.c
libxfs/xfs_log_rlimit.c
libxfs/xfs_rtbitmap.c
libxfs/xfs_sb.c
libxfs/xfs_symlink_remote.c
libxfs/xfs_trans_resv.c

index 95c33fc0045396a3a1c9cff6632907d9094ce36e..0afdcaf9966ddb702dae9d3b18597131effd5e27 100644 (file)
@@ -15,10 +15,10 @@ PKGHFILES = xfs_fs.h \
        xfs_types.h
 
 # headers with build dependencies
-SHFILES = xfs.h \
-       init.h \
+SHFILES = init.h \
        crc32defs.h \
-       crc32table.h
+       crc32table.h \
+       libxfs_priv.h
 
 HFILES = $(addprefix support/, $(SHFILES)) \
        xfs_dir2_priv.h
index 105d2f9769bb48df0e3d73682d62a42c1d4a2ce4..4753a1d788841dc2268b91de95228071f6722a99 100644 (file)
@@ -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"
index 42fa7af66dbceef637bc84639929b262c852caa3..6f404aaa85b4d6e90fbfbf8886d4f2e663961540 100644 (file)
@@ -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"
index c2b91fd9c05d2e037db09f274b54008da6b05cb1..6421304b08448ff4e256f8b44a754f4d67ce162b 100644 (file)
@@ -1,6 +1,6 @@
 
 
-#include "xfs.h"
+#include "libxfs_priv.h"
 
 /*
  * Simple memory interface
index f16a51c71325e633a9bca1e5b8579e0d55bc2646..885016a016734d71e50ee8e76c3c40d808a95e29 100644 (file)
@@ -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;
index 31d8005937264ef52849676c8b76ff7a41b6b799..ea85e72930c0d7ad932f4c0bbb1b6b2a91de220a 100644 (file)
@@ -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"
index 9f8d600ca53883219c4235e533a535f24eaa25db..03d6fc30ffeaa1596d865dbf44b1ac6475bfe331 100644 (file)
@@ -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:
index a24057b71383ade62a9d2e031b0a9a4cc0a35e86..2447764624b01a53144aa4d10647e06149545571 100644 (file)
@@ -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"
index 0eeb586779ad12c593f05ddc927ff7408bf52cc2..ba5026c262b157ff5fbd0e125ee8defd70e442b3 100644 (file)
@@ -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"
index 98d794dd42b8aac2ef9b35474aa8dd615f6b0775..d913a25a6dfcdc667988d191bd7de73ea6c11b06 100644 (file)
@@ -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"
index 20a072dd9c55de4e296741a7fd36af0ee025b931..7fd72af95b0b214cff1e2f1772a1151c2647eb3a 100644 (file)
@@ -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"
index 00a319bd60a9917740189c04d582e0d3753cce23..f8c24f6d89f1c1d1701b0dd4ae80564a72524d65 100644 (file)
@@ -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"
index 418138bae299f333cea3fb65c0462f63614b6f3e..714c25728400f66e332575c48ea8c2c8e490bc11 100644 (file)
@@ -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"
index 356b2e00e09e38a283944ad7c486ef0ea0ca73c6..4f492c18cc8c9bfb13ffff5cf3a7d9a87ef03fd5 100644 (file)
@@ -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"
index 1e2d38541a2509889a22866d07555b9337c230a5..c4e9da6fa9699ee16991fc2b07d37817b1720076 100644 (file)
@@ -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"
index f1ad2f97976cfc2fb0c9cfff5fa69c9a221e894a..2fd04e0cd19a43d62a965865070357318a0ca619 100644 (file)
@@ -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"
index c7933d7ec11fedcd71bb3997cdb320663f2a2395..d8788345403a80443e4f74f83be225b84ce8c825 100644 (file)
@@ -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"
index 0f84d102e7976fbd3553365439c99e2ef38f64d2..54ff154d2e86cdc149ff040c7e532f182705db44 100644 (file)
@@ -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"
index 9d624a6229468f721beaba38826008492f325aa0..e4c37f94866efffd977a3e30c1194378f89ec498 100644 (file)
@@ -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"
index 9ad9540d4635ffe86a0b2f4fda6a26e0927cc2eb..2a42317ab2f192cc697e2098961db3b9a1070ee9 100644 (file)
@@ -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"
index 4ca3cc56b465396df05be62e2d1048c29b4de5d9..79821fa69524022b0ccbb5ae18a2c8f16fd028ff 100644 (file)
@@ -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"
index 894691696c1a387c67bfdf3a23bda95931e8f9de..ca53e1b01d9be83e79bc0e7695b882307156a36f 100644 (file)
@@ -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"
index 8636b27c8f8d2b8038faedb93a15d4d1c3277063..b8e1355ed5a2aa9caac9283608507051df5cac06 100644 (file)
@@ -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"
index d7e68503f7ce53aa7aa639c4b11196f4c1ebdebf..00945e0a8fef9fbd5a8a486c901092dd886c8c50 100644 (file)
@@ -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"
index f549afef034efc96d496b177ac04c98907fa6086..e4b505b8bfe557c72298eca8f0281612193eada8 100644 (file)
@@ -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"
index 85827985fab99eb88d0b2fd4d2177a3af496dc9e..2e0484a6fe48c57c2fdfaccbb34a92e634ff5e4c 100644 (file)
@@ -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"
index 15e3a39eccf0cd932ffa939d32e4f4bea9944f82..7b2570036371fe210c4b33b701c8097e8d3d40c1 100644 (file)
@@ -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"
index fd62c7f90959ffdc78e4deb5f05e0912f4d1b931..9ac143a5efe3fd39766481feb900dc2d549eb6cb 100644 (file)
@@ -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"
index a7cbd8955f5e0e81ff6409b0bf399c8de3216384..fd48f043b842a013cedf4989b430e5dfa305566b 100644 (file)
@@ -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"
index 334ff86b4c651cf6d7c97704db139c27a54f58e1..e1968b43efd333408db812cef9087e938594ebf2 100644 (file)
@@ -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"
index c10597973333ce44487c4c1c6723dac4ed2d38a3..9264afa92d1e47d4c365d108946de8e931b1b421 100644 (file)
@@ -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"
index a4201566d6d568f9a9442d344f2161b3388b3b22..0054432c17329f7ac631a363287d98ea3d495a4e 100644 (file)
@@ -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"
index 37e2151d49a6f28aa2153bb6d7a73ec43491ac41..4d41d42e9f11b44f00b021043d1ec42595116613 100644 (file)
@@ -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"
index 1deea82662ecefba068234d87b58563a62bdf160..dcfb6d89d37a2bcdb3060aa4fa61164091e574d7 100644 (file)
@@ -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"
index 3034ccbf4e175db76dade1383665c7edf9208f05..d81ce08e3778a425b3e615849e4843f9dbcc0044 100644 (file)
@@ -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"