Merge remote branch 'cros/upstream' into tempbranch

client/samples/ext3_options

Index: client/samples/ext3_options
diff --git a/client/samples/ext3_options b/client/samples/ext3_options
deleted file mode 100644
index 7e7cf2c9a3067382e59f84d0cf9040da2ae7dccb..0000000000000000000000000000000000000000
--- a/client/samples/ext3_options
+++ /dev/null
@@ -1,20 +0,0 @@
-fs = job.filesystem('/dev/sda3', job.tmpdir)
-
-iters=10
-
-for fstype, mountopts, tag in (('ext2', '', 'ext2'),
-			       ('ext3', '-o data=writeback', 'ext3writeback'),
-			       ('ext3', '-o data=ordered', 'ext3ordered'),
-			       ('ext3', '-o data=journal', 'ext3journal')):
-	fs.mkfs(fstype)
-	fs.mount(args=mountopts)
-	try:
-		job.run_test('fsx', dir=job.tmpdir, tag=tag)
-		job.run_test('iozone', dir=job.tmpdir, iterations=iters, tag=tag)
-		job.run_test('dbench',
-			     iterations=iters,
-			     dir=job.tmpdir,
-			     tag=tag)
-		job.run_test('tiobench', dir=job.tmpdir, tag=tag)
-	finally:
-		fs.unmount()