From: Jens Axboe <jens.axboe@oracle.com>
Date: Mon, 19 Mar 2007 12:14:03 +0000 (+0100)
Subject: Revert b370e46b370e46... Put longest options first
X-Git-Tag: fio-1.15~73
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=37c8cdfeb2a551cadb59cee6e116cd543503a453

Revert b370e46b370e46... Put longest options first

This reverts commit b370e46abdd2bfe764e28efb41c4caadc632b937.

We should not have to do this, and the commit was even buggy since
it mistakenly put mmap inside the mmaphuge ifdef section. Just make
parse sort the posval entries.

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

diff --git a/options.c b/options.c
index e5ee4cf4..e7356f65 100644
--- a/options.c
+++ b/options.c
@@ -465,26 +465,26 @@ static struct fio_option options[] = {
 			    .oval = MEM_MALLOC,
 			    .help = "Use malloc(3) for IO buffers",
 			  },
+			  { .ival = "shm",
+			    .oval = MEM_SHM,
+			    .help = "Use shared memory segments for IO buffers",
+			  },
 #ifdef FIO_HAVE_HUGETLB
 			  { .ival = "shmhuge",
 			    .oval = MEM_SHMHUGE,
 			    .help = "Like shm, but use huge pages",
 			  },
-			  { .ival = "shm",
-			    .oval = MEM_SHM,
-			    .help = "Use shared memory segments for IO buffers",
-			  },
 #endif
+			  { .ival = "mmap",
+			    .oval = MEM_MMAP,
+			    .help = "Use mmap(2) (file or anon) for IO buffers",
+			  },
 #ifdef FIO_HAVE_HUGETLB
 			  { .ival = "mmaphuge",
 			    .oval = MEM_MMAPHUGE,
 			    .help = "Like mmap, but use huge pages",
 			  },
 #endif
-			  { .ival = "mmap",
-			    .oval = MEM_MMAP,
-			    .help = "Use mmap(2) (file or anon) for IO buffers",
-			  },
 		  },
 	},
 	{