From: Josef Cejka <jcejka@suse.com>
Date: Thu, 20 Aug 2015 15:52:51 +0000 (-0400)
Subject: btreplay: Fix typo in scaling up the dynamic cpu set size.
X-Git-Tag: blktrace-1.2.0~25
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=2564a6029e55d6a0507ebb28a5a01f5dffb0bd56;p=blktrace.git

btreplay: Fix typo in scaling up the dynamic cpu set size.

In get_ncpus, we default to using 4096 CPUs if _SC_NPROCESSORS_CONF isn't
enabled.  If that is insufficient, sched_getaffinity will fail and we
retry after doubling the size of the cpu_set_t allocation.  There's a typo
in there that means we don't actually double the size and will loop
forever allocating the same sized cpu_set_t instead.

Signed-off-by: Josef Cejka <jcejka@suse.com>
Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Signed-off-by: Jens Axboe <axboe@fb.com>
---

diff --git a/btreplay/btreplay.c b/btreplay/btreplay.c
index 5444010..f762279 100644
--- a/btreplay/btreplay.c
+++ b/btreplay/btreplay.c
@@ -516,7 +516,7 @@ realloc:
 	if (sched_getaffinity(getpid(), size, cpus)) {
 		if( errno == EINVAL && nrcpus < (4096<<4) ) {
 			CPU_FREE(cpus);
-			nrcpus <= 1;
+			nrcpus <<= 1;
 			goto realloc;
 		}
 		fatal("sched_getaffinity", ERR_SYSCALL, "Can't get CPU info\n");