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

diff --git a/Makefile.solaris b/Makefile.solaris
index e7ff53cb057be1ddb6a082c29cd2f2e62985cb9a..3b499e497b92e87a273c4ec0d97c5e91631feccf 100644 (file)
--- a/Makefile.solaris
+++ b/Makefile.solaris
@@ -51,3 +51,6 @@ cscope:
 install: $(PROGS) $(SCRIPTS)
        $(INSTALL) -m755 -d $(DESTDIR)$(bindir)
        $(INSTALL) $(PROGS) $(SCRIPTS) $(DESTDIR)$(bindir)
+       $(INSTALL) -m 755 -d $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 644 fio.1 $(DESTDIR)$(mandir)/man1
+       $(INSTALL) -m 644 fio_generate_plots.1 $(DESTDIR)$(mandir)/man1

diff --git a/fio.1 b/fio.1
index f01bf3a4faa9ef4a50aeb80dac3658c545eb356c..b0276c4cfb17f7b5cc33daa30e23a324d9a1b5c8 100644 (file)
--- a/fio.1
+++ b/fio.1
@@ -226,7 +226,7 @@ are likely to be issued. Default: true.
 .BI size \fR=\fPint
 Total size of I/O for this job.  \fBfio\fR will run until this many bytes have
 been transfered, unless limited by other options (\fBruntime\fR, for instance).
-Unless \fBnr_files\fR and \fBfilesize\fR options are given, this amount will be
+Unless \fBnrfiles\fR and \fBfilesize\fR options are given, this amount will be
 divided between the available files for the job. If not set, fio will use the
 full size of the given files or devices. If the the files do not exist, size
 must be given.

diff --git a/options.c b/options.c
index d111018820603fe0e3a578524872343929411ce8..a08e2e433c51b50ec74a86b1b148056f697e81d2 100644 (file)
--- a/options.c
+++ b/options.c
@@ -1121,6 +1121,7 @@ static struct fio_option options[FIO_MAX_OPTS] = {
        },
        {
                .name   = "nrfiles",
+               .alias  = "nr_files",
                .type   = FIO_OPT_INT,
                .off1   = td_var_offset(nr_files),
                .help   = "Split job workload between this number of files",