The following changes since commit 0981fd718a4b03a807c1b4b2ae6d0e93deee28c5:
Kill some newly added whitespace (2012-09-20 19:23:02 +0200)
are available in the git repository at:
git://git.kernel.dk/fio.git master
Jens Axboe (3):
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
Check for ENOSPC on shmget() failure
Merge branch 'master' of ssh://brick.kernel.dk/data/git/fio
Shaohua Li (1):
Correctly apply size percentage for file iosize
filesetup.c | 8 ++++----
init.c | 2 +-
2 files changed, 5 insertions(+), 5 deletions(-)
---
Diff of recent changes:
diff --git a/filesetup.c b/filesetup.c
index 06b7d7f..9679c88 100644
--- a/filesetup.c
+++ b/filesetup.c
@@ -766,8 +766,11 @@ int setup_files(struct thread_data *td)
if (f->io_size == -1ULL)
total_size = -1ULL;
- else
+ else {
+ if (td->o.size_percent)
+ f->io_size = (f->io_size * td->o.size_percent) / 100;
total_size += f->io_size;
+ }
if (f->filetype == FIO_TYPE_FILE &&
(f->io_size + f->file_offset) > f->real_file_size &&
@@ -781,9 +784,6 @@ int setup_files(struct thread_data *td)
}
}
- if (td->o.size_percent)
- total_size = (total_size * td->o.size_percent) / 100;
-
if (!td->o.size || td->o.size > total_size)
td->o.size = total_size;
diff --git a/init.c b/init.c
index da1f472..b3215f5 100644
--- a/init.c
+++ b/init.c
@@ -254,7 +254,7 @@ static int setup_thread_area(void)
shm_id = shmget(0, size, IPC_CREAT | 0600);
if (shm_id != -1)
break;
- if (errno != EINVAL && errno != ENOMEM) {
+ if (errno != EINVAL && errno != ENOMEM && errno != ENOSPC) {
perror("shmget");
break;
}
--
To unsubscribe from this list: send the line "unsubscribe fio" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
