3 files changed, 15 insertions, 8 deletions
diff --git a/source3/torture/masktest.c b/source3/torture/masktest.c
index 768323b9f7..83b70c25f8 100644
--- a/source3/torture/masktest.c
+++ b/source3/torture/masktest.c
@@ -263,9 +263,10 @@ static struct cli_state *connect_one(char *share)
 }
 
 static char *resultp;
-static file_info *f_info;
+static struct file_info *f_info;
 
-static void listfn(const char *mnt, file_info *f, const char *s, void *state)
+static void listfn(const char *mnt, struct file_info *f, const char *s,
+		   void *state)
 {
 	if (strcmp(f->name,".") == 0) {
 		resultp[0] = '+';
diff --git a/source3/torture/nbio.c b/source3/torture/nbio.c
index f69e4c3a2b..db24f10cc5 100644
--- a/source3/torture/nbio.c
+++ b/source3/torture/nbio.c
@@ -262,7 +262,8 @@ void nb_qfsinfo(int level)
 	cli_dskattr(c, &bsize, &total, &avail);
 }
 
-static void find_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static void find_fn(const char *mnt, struct file_info *finfo, const char *name,
+		    void *state)
 {
 	/* noop */
 }
@@ -281,7 +282,8 @@ void nb_flush(int fnum)
 
 static int total_deleted;
 
-static void delete_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static void delete_fn(const char *mnt, struct file_info *finfo,
+		      const char *name, void *state)
 {
 	char *s, *n;
 	if (finfo->name[0] == '.') return;
diff --git a/source3/torture/torture.c b/source3/torture/torture.c
index 79128cf4a6..df8adbdfdf 100644
--- a/source3/torture/torture.c
+++ b/source3/torture/torture.c
@@ -4791,7 +4791,8 @@ static bool run_openattrtest(int dummy)
 	return correct;
 }
 
-static void list_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static void list_fn(const char *mnt, struct file_info *finfo,
+		    const char *name, void *state)
 {
 
 }
@@ -4850,7 +4851,8 @@ static bool run_dirtest(int dummy)
 	return correct;
 }
 
-static void del_fn(const char *mnt, file_info *finfo, const char *mask, void *state)
+static void del_fn(const char *mnt, struct file_info *finfo, const char *mask,
+		   void *state)
 {
 	struct cli_state *pcli = (struct cli_state *)state;
 	fstring fname;
@@ -6151,7 +6153,8 @@ static bool run_uid_regression_test(int dummy)
 static const char *illegal_chars = "*\\/?<>|\":";
 static char force_shortname_chars[] = " +,.[];=\177";
 
-static void shortname_del_fn(const char *mnt, file_info *finfo, const char *mask, void *state)
+static void shortname_del_fn(const char *mnt, struct file_info *finfo,
+			     const char *mask, void *state)
 {
 	struct cli_state *pcli = (struct cli_state *)state;
 	fstring fname;
@@ -6174,7 +6177,8 @@ struct sn_state {
 	bool val;
 };
 
-static void shortname_list_fn(const char *mnt, file_info *finfo, const char *name, void *state)
+static void shortname_list_fn(const char *mnt, struct file_info *finfo,
+			      const char *name, void *state)
 {
 	struct sn_state *s = (struct sn_state  *)state;
 	int i = s->i;