Make sure a bunch of inline functions are static to ensure they are

either inlined or remain outlined.

5 files changed, 38 insertions, 10 deletions

diff --git a/sysutils/xfsprogs/distinfo b/sysutils/xfsprogs/distinfo
index ed919576c4a..902f1ea6f11 100644
--- a/sysutils/xfsprogs/distinfo
+++ b/sysutils/xfsprogs/distinfo
@@ -1,11 +1,11 @@
-$NetBSD: distinfo,v 1.4 2010/10/12 16:43:00 joerg Exp $
+$NetBSD: distinfo,v 1.5 2012/10/26 20:32:56 joerg Exp $
 
 SHA1 (xfsprogs-2.7.3.src.tar.gz) = abfe3ea13475810a0ef854f48b9ca9912ee7fbc5
 RMD160 (xfsprogs-2.7.3.src.tar.gz) = 7a4f6b0d5da640041334cef4b4aa2e60ba43af53
 Size (xfsprogs-2.7.3.src.tar.gz) = 895400 bytes
 SHA1 (patch-aa) = c2d7667d5f4d7cf027ef0c41b774852cc28638e5
-SHA1 (patch-ab) = beb412afa8904af887ba237f356bd29ac3327755
-SHA1 (patch-ac) = 417f9e94d22f39947932bf38147aab90384f308c
+SHA1 (patch-ab) = d69fdc650846cccad73f1c013d082010e24b98f8
+SHA1 (patch-ac) = 8ea43fb0612f37fde1bcf987fd3862e6fd33ac9c
 SHA1 (patch-ad) = 3ecf2ef5eb280fc36d68ed6b8ed348faae32d9ff
 SHA1 (patch-ae) = 5224f9a7aaa31e25e15ad1706da076fdda21b0c0
 SHA1 (patch-af) = 92acf0b8ffe373570750f7a3dcb86c219a4f880d
@@ -18,3 +18,5 @@ SHA1 (patch-al) = 832d5d90b9314f5aea312908df16ff3c74449d00
 SHA1 (patch-am) = 3d705bee711c5636c9ea73142560d1ff8530a48d
 SHA1 (patch-an) = a4a2b5fcbbcbcc4b49b75d7d3114da8ebd1f0377
 SHA1 (patch-ao) = 89b7c799440ad7c189c4957d5c6179973ca4def8
+SHA1 (patch-libxfs_xfs__bmap__btree.c) = 030a74c9aedc75367a3f6cf243cb5f7ae1c98919
+SHA1 (patch-libxfs_xfs__ialloc.c) = 351643a5b9c53c99115a0c56286850670d904011
diff --git a/sysutils/xfsprogs/patches/patch-ab b/sysutils/xfsprogs/patches/patch-ab
index 51e75318b8f..23b4226b9e9 100644
--- a/sysutils/xfsprogs/patches/patch-ab
+++ b/sysutils/xfsprogs/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/12/30 23:03:05 agc Exp $
+$NetBSD: patch-ab,v 1.2 2012/10/26 20:32:56 joerg Exp $
 
---- include/builddefs.in	2005/12/29 13:56:15	1.1
-+++ include/builddefs.in	2005/12/29 13:59:14
-@@ -116,6 +116,11 @@
+--- include/builddefs.in.orig	2005-10-07 16:51:34.000000000 +0000
++++ include/builddefs.in
+@@ -116,6 +116,11 @@ ifeq ($(PKG_PLATFORM),freebsd)
  PLDLIBS = -L/usr/local/lib -lintl
  PCFLAGS = -I/usr/local/include
  endif
diff --git a/sysutils/xfsprogs/patches/patch-ac b/sysutils/xfsprogs/patches/patch-ac
index 60ab258a71f..0d2de917cb5 100644
--- a/sysutils/xfsprogs/patches/patch-ac
+++ b/sysutils/xfsprogs/patches/patch-ac
@@ -1,7 +1,7 @@
-$NetBSD: patch-ac,v 1.1.1.1 2005/12/30 23:03:05 agc Exp $
+$NetBSD: patch-ac,v 1.2 2012/10/26 20:32:56 joerg Exp $
 
---- include/platform_defs.h.in	2005/12/29 14:03:45	1.1
-+++ include/platform_defs.h.in	2005/12/29 14:04:54
+--- include/platform_defs.h.in.orig	2005-10-07 16:51:34.000000000 +0000
++++ include/platform_defs.h.in
 @@ -50,6 +50,8 @@
  #include <xfs/linux.h>
  #elif defined(__FreeBSD__)
diff --git a/sysutils/xfsprogs/patches/patch-libxfs_xfs__bmap__btree.c b/sysutils/xfsprogs/patches/patch-libxfs_xfs__bmap__btree.c
new file mode 100644
index 00000000000..c7f4ce44864
--- /dev/null
+++ b/sysutils/xfsprogs/patches/patch-libxfs_xfs__bmap__btree.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-libxfs_xfs__bmap__btree.c,v 1.1 2012/10/26 20:32:56 joerg Exp $
+
+--- libxfs/xfs_bmap_btree.c.orig	2012-10-26 15:06:31.000000000 +0000
++++ libxfs/xfs_bmap_btree.c
+@@ -1552,7 +1552,7 @@ xfs_bmbt_delete(
+  * xfs_bmbt_get_startblock, xfs_bmbt_get_blockcount and xfs_bmbt_get_state.
+  */
+ 
+-STATIC __inline__ void
++static void
+ __xfs_bmbt_get_all(
+ 		__uint64_t l0,
+ 		__uint64_t l1,
diff --git a/sysutils/xfsprogs/patches/patch-libxfs_xfs__ialloc.c b/sysutils/xfsprogs/patches/patch-libxfs_xfs__ialloc.c
new file mode 100644
index 00000000000..7245fa81ae2
--- /dev/null
+++ b/sysutils/xfsprogs/patches/patch-libxfs_xfs__ialloc.c
@@ -0,0 +1,13 @@
+$NetBSD: patch-libxfs_xfs__ialloc.c,v 1.1 2012/10/26 20:32:56 joerg Exp $
+
+--- libxfs/xfs_ialloc.c.orig	2012-10-26 15:05:39.000000000 +0000
++++ libxfs/xfs_ialloc.c
+@@ -315,7 +315,7 @@ xfs_ialloc_ag_alloc(
+ 	return 0;
+ }
+ 
+-STATIC __inline xfs_agnumber_t
++static xfs_agnumber_t
+ xfs_ialloc_next_ag(
+ 	xfs_mount_t	*mp)
+ {