Merge branch 'master' of ssh://router/data/git/fio

[fio.git] / fio-ini.c

diff --git a/fio-ini.c b/fio-ini.c
index eeef3052ec08056ed1ae96829e603de39775bb1f..9b9262c9d8e0274528ce991190b01b365d86e523 100644 (file)
--- a/fio-ini.c
+++ b/fio-ini.c
@@ -50,6 +50,7 @@ int rate_quit = 0;
 int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 0;
 int write_lat_log = 0;
 int write_bw_log = 0;
 int exitall_on_terminate = 0;

+unsigned long long mlock_size = 0;

 
 static int setup_rate(struct thread_data *td)
 {
 
 static int setup_rate(struct thread_data *td)
 {


@@ -807,6 +808,10 @@ int parse_jobs_ini(char *file)
                                fgetpos(f, &off);
                                continue;
                        }
                                fgetpos(f, &off);
                                continue;
                        }

+                       if (!check_strcnv(p, "lockmem", &mlock_size)) {
+                               fgetpos(f, &off);
+                               continue;
+                       }

                        if (!check_strstore(p, "directory", td->directory)) {
                                fgetpos(f, &off);
                                continue;
                        if (!check_strstore(p, "directory", td->directory)) {
                                fgetpos(f, &off);
                                continue;