From: Jens Axboe <axboe@nelson.home.kernel.dk>
Date: Wed, 31 May 2006 08:16:18 +0000 (+0200)
Subject: Merge branch 'master' of ssh://router/data/git/fio
X-Git-Tag: fio-1.4~11
X-Git-Url: https://git.kernel.dk/?p=fio.git;a=commitdiff_plain;h=a4e167ee3ba40cb0587cf27dca2a9f8b947e568a;hp=-c

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

a4e167ee3ba40cb0587cf27dca2a9f8b947e568a
diff --combined fio-ini.c
index ff121cba,eeef3052..9b9262c9
--- a/fio-ini.c
+++ b/fio-ini.c
@@@ -50,7 -50,6 +50,7 @@@ int rate_quit = 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)
  {
@@@ -487,6 -486,9 +487,9 @@@ static int check_int(char *p, char *nam
  {
  	char *str;
  
+ 	if (strncmp(p, name, strlen(name)))
+ 		return 1;
+ 
  	str = strstr(p, name);
  	if (!str)
  		return 1;
@@@ -670,6 -672,7 +673,7 @@@ int parse_jobs_ini(char *file
  				continue;
  			if (strstr(p, "["))
  				break;
+ 			strip_blank_front(&p);
  			strip_blank_end(p);
  
  			if (!check_int(p, "prio", &prio)) {
@@@ -804,10 -807,6 +808,10 @@@
  				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;