options: move pattern_fmt_desc where we need it

No need for that to be global.

Signed-off-by: Jens Axboe <axboe@fb.com>

diff --git a/options.c b/options.c
index 13f99157f96eb23fd43a227d4dc8378f3ebc6e0a..871552b5b4eefa1f355f03532981e566d3d6d15b 100644 (file)
--- a/options.c
+++ b/options.c
@@ -20,14 +20,6 @@
 
 char client_sockaddr_str[INET6_ADDRSTRLEN] = { 0 };
 
 
 char client_sockaddr_str[INET6_ADDRSTRLEN] = { 0 };
 

-struct pattern_fmt_desc fmt_desc[] = {
-       {
-               .fmt   = "%o",
-               .len   = FIELD_SIZE(struct io_u *, offset),
-               .paste = paste_blockoff
-       }
-};
-

 /*
  * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
  */
 /*
  * Check if mmap/mmaphuge has a :/foo/bar/file at the end. If so, return that.
  */


@@ -962,13 +954,20 @@ static int str_dedupe_cb(void *data, unsigned long long *il)
 
 static int str_verify_pattern_cb(void *data, const char *input)
 {
 
 static int str_verify_pattern_cb(void *data, const char *input)
 {

+       struct pattern_fmt_desc fmt_desc[] = {
+               {
+                       .fmt   = "%o",
+                       .len   = FIELD_SIZE(struct io_u *, offset),
+                       .paste = paste_blockoff
+               }
+       };

        struct thread_data *td = data;
        int ret;
 
        td->o.verify_fmt_sz = ARRAY_SIZE(td->o.verify_fmt);
        ret = parse_and_fill_pattern(input, strlen(input), td->o.verify_pattern,
        struct thread_data *td = data;
        int ret;
 
        td->o.verify_fmt_sz = ARRAY_SIZE(td->o.verify_fmt);
        ret = parse_and_fill_pattern(input, strlen(input), td->o.verify_pattern,

-                                    MAX_PATTERN_SIZE, fmt_desc, sizeof(fmt_desc),
-                                    td->o.verify_fmt, &td->o.verify_fmt_sz);
+                       MAX_PATTERN_SIZE, fmt_desc, sizeof(fmt_desc),
+                       td->o.verify_fmt, &td->o.verify_fmt_sz);

        if (ret < 0)
                return 1;
 
        if (ret < 0)
                return 1;