Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio

diff --git a/README b/README
index 7a49dda519b170bdd3c6ed881a96f482ac8c52c9..480f1d0ef6d455efa1e49c672def112b0607e6c1 100644 (file)
--- a/README
+++ b/README
@@ -141,9 +141,11 @@ always parsed and taken into account.
 
 Fio has an internal allocator for shared memory called smalloc. It
 allocates shared structures from this pool. The pool defaults to 1024k
-in size, and can grow to 32 pools. If running large jobs with randommap
+in size, and can grow to 128 pools. If running large jobs with randommap
 enabled it can run out of memory, in which case the --alloc-size switch
-is handy for starting with a larger pool size.
+is handy for starting with a larger pool size. The backing store is
+files in /tmp. Fio cleans up after itself, while it is running you
+may see .fio_smalloc.* files in /tmp.
 
 
 Job file

diff --git a/init.c b/init.c
index 6fdd2116601191ff08297cd7759a809a86c03fb8..4ae3baf0af67b85d88eeaa476f3135011649755c 100644 (file)
--- a/init.c
+++ b/init.c
@@ -608,7 +608,7 @@ static int skip_this_section(const char *name)
        if (!strncmp(name, "global", 6))
                return 0;
 
-       return strncmp(job_section, name, strlen(job_section));
+       return strcmp(job_section, name);
 }
 
 static int is_empty_or_comment(char *line)