X-Git-Url: https://git.kernel.dk/?p=fio.git;a=blobdiff_plain;f=filesetup.c;h=a3bafca1ec10ef587f455170eb9e04ae9a570af7;hp=ff1385cdd02675f252b68502b4d59badd022d7d1;hb=509eab12448823a8eefbe925804b5308ee63bf5e;hpb=ea966f8188915643670fd0a13d1bf37d45936da5;ds=sidebyside

diff --git a/filesetup.c b/filesetup.c
index ff1385cd..a3bafca1 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -18,6 +18,11 @@ static int extend_file(struct thread_data *td, struct fio_file *f)
 	unsigned int bs;
 	char *b;
 
+	if (read_only) {
+		log_err("fio: refusing extend of file due to read-only\n");
+		return 0;
+	}
+
 	/*
 	 * check if we need to lay the file out complete again. fio
 	 * does that for operations involving reads, or for writes
@@ -226,8 +231,13 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 		flags |= OS_O_DIRECT;
 	if (td->o.sync_io)
 		flags |= O_SYNC;
+	if (f->filetype != FIO_TYPE_FILE)
+		flags |= O_NOATIME;
 
+open_again:
 	if (td_write(td)) {
+		assert(!read_only);
+
 		flags |= O_RDWR;
 
 		if (f->filetype == FIO_TYPE_FILE)
@@ -238,7 +248,7 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 		else
 			f->fd = open(f->file_name, flags, 0600);
 	} else {
-		if (f->filetype == FIO_TYPE_CHAR)
+		if (f->filetype == FIO_TYPE_CHAR && !read_only)
 			flags |= O_RDWR;
 		else
 			flags |= O_RDONLY;
@@ -253,6 +263,11 @@ int generic_open_file(struct thread_data *td, struct fio_file *f)
 		char buf[FIO_VERROR_SIZE];
 		int __e = errno;
 
+		if (errno == EPERM && (flags & O_NOATIME)) {
+			flags &= ~O_NOATIME;
+			goto open_again;
+		}
+
 		snprintf(buf, sizeof(buf) - 1, "open(%s)", f->file_name);
 
 		td_verror(td, __e, buf);
@@ -364,7 +379,8 @@ int setup_files(struct thread_data *td)
 	/*
 	 * device/file sizes are zero and no size given, punt
 	 */
-	if ((!total_size || total_size == -1ULL) && !td->o.size) {
+	if ((!total_size || total_size == -1ULL) && !td->o.size &&
+	    !(td->io_ops->flags & FIO_NOIO)) {
 		log_err("%s: you need to specify size=\n", td->o.name);
 		td_verror(td, EINVAL, "total_file_size");
 		return 1;
@@ -387,7 +403,7 @@ int setup_files(struct thread_data *td)
 			 * zero, set it to the real file size.
 			 */
 			f->io_size = td->o.size / td->o.nr_files;
-			if (!f->io_size) {
+			if (!f->io_size || f->io_size > f->real_file_size) {
 				if (f->file_offset > f->real_file_size)
 					goto err_offset;
 				f->io_size = f->real_file_size - f->file_offset;
@@ -468,7 +484,7 @@ err_offset:
 
 int init_random_map(struct thread_data *td)
 {
-	int num_maps, blocks;
+	unsigned long long blocks, num_maps;
 	struct fio_file *f;
 	unsigned int i;
 
@@ -476,8 +492,8 @@ int init_random_map(struct thread_data *td)
 		return 0;
 
 	for_each_file(td, f, i) {
-		blocks = (f->real_file_size + td->o.rw_min_bs - 1) / td->o.rw_min_bs;
-		num_maps = (blocks + BLOCKS_PER_MAP-1)/ BLOCKS_PER_MAP;
+		blocks = (f->real_file_size + td->o.rw_min_bs - 1) / (unsigned long long) td->o.rw_min_bs;
+		num_maps = (blocks + BLOCKS_PER_MAP-1)/ (unsigned long long) BLOCKS_PER_MAP;
 		f->file_map = malloc(num_maps * sizeof(long));
 		if (!f->file_map) {
 			log_err("fio: failed allocating random map. If running a large number of jobs, try the 'norandommap' option\n");