From 8c3016bc8446f2c3079d2665960d0a2ae980713c Mon Sep 17 00:00:00 2001
From: Dave Chinner <david@fromorbit.com>
Date: Tue, 4 Aug 2015 16:34:42 +1000
Subject: [PATCH] xfstests: fix build errors and warnings

After upgrading userspace on test machines to xfsprogs-4.2.0-rc1,
lots of build warnings and failures are exposed from implicit
includes that no longer exist. Hence these need fixing to allow
fstests to build correctly.

gcc also seems to have grown new stupidities around uninitialised
variables, so fix them while touching the same files.

Signed-off-by: Dave Chinner <david@fromorbit.com>
---
 dmapi/src/common/cmd/write_invis.c             |  1 +
 dmapi/src/common/lib/util.c                    |  1 +
 dmapi/src/suite1/cmd/get_dirattrs.c            |  1 +
 dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c |  3 +++
 dmapi/src/suite2/src/test_dmattr.c             |  1 +
 ltp/doio.c                                     |  1 +
 src/bulkstat_unlink_test.c                     |  2 ++
 src/bulkstat_unlink_test_modified.c            |  2 ++
 src/iopat.c                                    |  3 +++
 src/trunc.c                                    | 12 ++++++------
 src/unwritten_sync.c                           |  2 ++
 src/xfsctl.c                                   |  5 +++++
 12 files changed, 28 insertions(+), 6 deletions(-)

diff --git a/dmapi/src/common/cmd/write_invis.c b/dmapi/src/common/cmd/write_invis.c
index 28744ac5..b0b2af62 100644
--- a/dmapi/src/common/cmd/write_invis.c
+++ b/dmapi/src/common/cmd/write_invis.c
@@ -18,6 +18,7 @@
 
 #include <lib/hsm.h>
 
+#include <unistd.h>
 #include <string.h>
 #include <malloc.h>
 #include <getopt.h>
diff --git a/dmapi/src/common/lib/util.c b/dmapi/src/common/lib/util.c
index 2ee7c33c..8a256b31 100644
--- a/dmapi/src/common/lib/util.c
+++ b/dmapi/src/common/lib/util.c
@@ -23,6 +23,7 @@
 
 #include <unistd.h>
 #include <stdarg.h>
+#include <ctype.h>
 
 #include <lib/hsm.h>
 
diff --git a/dmapi/src/suite1/cmd/get_dirattrs.c b/dmapi/src/suite1/cmd/get_dirattrs.c
index 49ac356e..a7e671ef 100644
--- a/dmapi/src/suite1/cmd/get_dirattrs.c
+++ b/dmapi/src/suite1/cmd/get_dirattrs.c
@@ -17,6 +17,7 @@
  */
 
 #include <lib/hsm.h>
+#include <string.h>
 
 /*---------------------------------------------------------------------------
 
diff --git a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
index c01dff00..855c5f60 100644
--- a/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
+++ b/dmapi/src/suite1/cmd/probe_punch_xfsctl_hole.c
@@ -18,8 +18,11 @@
 
 #include <lib/hsm.h>
 
+#include <unistd.h>
 #include <getopt.h>
 #include <string.h>
+#include <fcntl.h>
+
 
 
 /*---------------------------------------------------------------------------
diff --git a/dmapi/src/suite2/src/test_dmattr.c b/dmapi/src/suite2/src/test_dmattr.c
index cf870772..a8a05958 100644
--- a/dmapi/src/suite2/src/test_dmattr.c
+++ b/dmapi/src/suite2/src/test_dmattr.c
@@ -16,6 +16,7 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <unistd.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 
diff --git a/ltp/doio.c b/ltp/doio.c
index 966cff1d..dcb3efd8 100644
--- a/ltp/doio.c
+++ b/ltp/doio.c
@@ -29,6 +29,7 @@
 
 #include "global.h"
 
+#include <stdarg.h>
 #include <sys/uio.h>	/* for struct iovec (readv)*/
 #include <sys/mman.h>	/* for mmap(2) */
 #include <sys/ipc.h>	/* for i/o buffer in shared memory */
diff --git a/src/bulkstat_unlink_test.c b/src/bulkstat_unlink_test.c
index afd69ffe..cdf720ef 100644
--- a/src/bulkstat_unlink_test.c
+++ b/src/bulkstat_unlink_test.c
@@ -3,12 +3,14 @@
  * Test bulkstat doesn't returned unlinked inodes.
  * Mark Goodwin <markgw@sgi.com> Fri Jul 20 09:13:57 EST 2007
  */
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <xfs/xfs.h>
 #include <unistd.h>
 #include <getopt.h>
+#include <string.h>
 
 int
 main(int argc, char *argv[])
diff --git a/src/bulkstat_unlink_test_modified.c b/src/bulkstat_unlink_test_modified.c
index 3a50d61b..66049926 100644
--- a/src/bulkstat_unlink_test_modified.c
+++ b/src/bulkstat_unlink_test_modified.c
@@ -6,11 +6,13 @@
  * This is a modified version of bulkstat_unlink_test.c to reproduce a specific
  * problem see pv 969192
  */
+#include <stdlib.h>
 #include <sys/types.h>
 #include <sys/stat.h>
 #include <fcntl.h>
 #include <xfs/xfs.h>
 #include <unistd.h>
+#include <string.h>
 
 int
 main(int argc, char *argv[])
diff --git a/src/iopat.c b/src/iopat.c
index f34de19c..7383af50 100644
--- a/src/iopat.c
+++ b/src/iopat.c
@@ -16,6 +16,9 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
 #include <xfs/xfs.h>
diff --git a/src/trunc.c b/src/trunc.c
index c6098523..2b35d1ef 100644
--- a/src/trunc.c
+++ b/src/trunc.c
@@ -47,17 +47,17 @@ int	argc;
 char	**argv;
 {
 	int fd, err, elapsed;
-	char *buf, *goodbuf;
+	char *buf = NULL, *goodbuf = NULL;
 	time_t starttime;
         char *filename="testfile";
- 	int c;
+	int c;
 
-if(argc != 3)
-        {        printf("Usage: trunc -f testfilename\n");
-                exit(1);
+	if (argc != 3) {
+		printf("Usage: trunc -f testfilename\n");
+		exit(1);
         }
 
-while((c=getopt(argc,argv,"f:"))!=EOF) {
+	while((c=getopt(argc,argv,"f:"))!=EOF) {
 		switch (c) {
 		case 'f':
 			filename = optarg;
diff --git a/src/unwritten_sync.c b/src/unwritten_sync.c
index bf61adf0..ebdc8248 100644
--- a/src/unwritten_sync.c
+++ b/src/unwritten_sync.c
@@ -1,3 +1,5 @@
+#include <stdlib.h>
+#include <string.h>
 #include <sys/types.h>
 #include <fcntl.h>
 #include <errno.h>
diff --git a/src/xfsctl.c b/src/xfsctl.c
index 3f82f4ad..bf2a873a 100644
--- a/src/xfsctl.c
+++ b/src/xfsctl.c
@@ -16,7 +16,12 @@
  * Inc.,  51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
  */
 
+#include <stdlib.h>
+#include <string.h>
+#include <unistd.h>
 #include <sys/stat.h>
+#include <sys/types.h>
+#include <fcntl.h>
 
 #include <xfs/xfs.h>
 #include <xfs/jdm.h>