Merge pull request #104 from roidayan/fix_flashcache_load

Fix flashcache_load getting cachedev from argv when using flags
facebookarchive · Feb 27, 2013 · 542a8ec · 542a8ec
2 parents ed198f8 + f99b7c4
commit 542a8ec
Showing 1 changed file with 4 additions and 4 deletions.
diff --git a/src/utils/flashcache_load.c b/src/utils/flashcache_load.c
@@ -114,7 +114,7 @@ main(int argc, char **argv)
 		}
 	}
 
-	if ((argc < 2) || (argc > 3)) {
+	if ((argc < 2) || (argc > 4)) {
 		usage(pname);
 	}
 
@@ -143,10 +143,10 @@ main(int argc, char **argv)
 	}
 
 	// switch to new vdev name if requested by load command
-	if (argc == 3) {
+	if (optind == argc) {
-		cachedev = argv[optind];
-	} else {
 		cachedev = sb->cache_devname;
+	} else {
+		cachedev = argv[optind];
 	}
 	disk_devname = sb->disk_devname;