gfio: update new options for gfio opt format

And fix gclient.c updates for num2str().

Signed-off-by: Jens Axboe <axboe@kernel.dk>
diff --git a/options.c b/options.c
index b8ce5a7..8a8f24c 100644
--- a/options.c
+++ b/options.c
@@ -1173,24 +1173,8 @@
 		.prio	= -1, /* must come after "directory" */
 		.help	= "Override default $jobname.$jobnum.$filenum naming",
 		.def	= "$jobname.$jobnum.$filenum",
-	},
-	{
-		.name	= "kb_base",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(kb_base),
-		.verify	= kb_base_verify,
-		.prio	= 1,
-		.def	= "1024",
-		.help	= "How many bytes per KB for reporting (1000 or 1024)",
-	},
-	{
-		.name	= "unit_base",
-		.type	= FIO_OPT_INT,
-		.off1	= td_var_offset(unit_base),
-		.verify	= unit_base_verify,
-		.prio	= 1,
-		.def	= "0",
-		.help	= "Bit multiple of result summary data (8 for byte, 1 for bit)",
+		.category = FIO_OPT_C_FILE,
+		.group	= FIO_OPT_G_FILENAME,
 	},
 	{
 		.name	= "lockfile",
@@ -3115,6 +3099,17 @@
 		.group	= FIO_OPT_G_INVALID,
 	},
 	{
+		.name	= "unit_base",
+		.type	= FIO_OPT_INT,
+		.off1	= td_var_offset(unit_base),
+		.verify	= unit_base_verify,
+		.prio	= 1,
+		.def	= "0",
+		.help	= "Bit multiple of result summary data (8 for byte, 1 for bit)",
+		.category = FIO_OPT_C_GENERAL,
+		.group	= FIO_OPT_G_INVALID,
+	},
+	{
 		.name	= "hugepage-size",
 		.lname	= "Hugepage size",
 		.type	= FIO_OPT_INT,