Cleanup profile support

This is closer to where it needs to end up. No ext_options, just
include profile options in the general option table (and mark them
private for that profile).

Profile options are only available after loading a specific profile,
so there should be less confusion.

Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
diff --git a/fio.h b/fio.h
index 91a28b4..23e007b 100644
--- a/fio.h
+++ b/fio.h
@@ -29,6 +29,7 @@
 #include "ioengine.h"
 #include "iolog.h"
 #include "helpers.h"
+#include "options.h"
 
 #ifdef FIO_HAVE_GUASI
 #include <guasi.h>
@@ -539,7 +540,7 @@
 extern void td_fill_rand_seeds(struct thread_data *);
 extern void add_job_opts(const char **);
 #define FIO_GETOPT_JOB		0x89988998
-#define FIO_NR_OPTIONS		512
+#define FIO_NR_OPTIONS		(FIO_MAX_OPTS + 128)
 
 /*
  * ETA/status stuff