Recent changes (master)

Jens Axboe
2015-04-22T12:00:04Z

The following changes since commit 1d6d3455a9ad610a423f5d4ca849fbe82049997c:

Don't export state variable (2015-04-20 19:15:50 -0600)

are available in the git repository at:

git://git.kernel.dk/fio.git master

for you to fetch changes up to 9e98688960347b9b733db9426fb7747f22d3a77e:

Fix off-by-one in cpus_allowed (2015-04-21 09:39:32 -0600)

----------------------------------------------------------------
Jens Axboe (2):
Fix off-by-one in cpu mask index handling
Fix off-by-one in cpus_allowed

options.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

---

Diff of recent changes:

diff --git a/options.c b/options.c
index 017920e..5fbad31 100644
--- a/options.c
+++ b/options.c
@@ -443,9 +443,9 @@ static int str_cpumask_cb(void *data, unsigned long long *val)

for (i = 0; i < sizeof(int) * 8; i++) {
if ((1 << i) & *val) {
- if (i > max_cpu) {
+ if (i >= max_cpu) {
log_err("fio: CPU %d too large (max=%ld)\n", i,
- max_cpu);
+ max_cpu - 1);
return 1;
}
dprint(FD_PARSE, "set cpu allowed %d\n", i);
@@ -503,9 +503,9 @@ static int set_cpus_allowed(struct thread_data *td, os_cpu_mask_t *mask,
ret = 1;
break;
}
- if (icpu > max_cpu) {
+ if (icpu >= max_cpu) {
log_err("fio: CPU %d too large (max=%ld)\n",
- icpu, max_cpu);
+ icpu, max_cpu - 1);
ret = 1;
break;
}