From 1c6b9135ff18a3581121bb996e2616418652aec3 Mon Sep 17 00:00:00 2001
From: Kevin Vigor <kvigor@fb.com>
Date: Tue, 24 Jan 2017 17:38:55 -0800
Subject: Fix merge error which broke all the things

Summary:

Fix merge error which broke all the things.

Test Plan:

prove tests/basic/accept_v4v6.t

Reviewers:

Subscribers:

Tasks:

Blame Revision:

Change-Id: I65a3e1c60d7e63093c29e7357cc92cda385bce46
Signed-off-by: Kevin Vigor <kvigor@fb.com>
Reviewed-on: https://review.gluster.org/16466
CentOS-regression: Gluster Build System <jenkins@build.gluster.org>
NetBSD-regression: NetBSD Build System <jenkins@build.gluster.org>
Smoke: Gluster Build System <jenkins@build.gluster.org>
Reviewed-by: Shreyas Siravara <sshreyas@fb.com>
---
 xlators/performance/io-threads/src/io-threads.c | 1 -
 1 file changed, 1 deletion(-)

(limited to 'xlators/performance')

diff --git a/xlators/performance/io-threads/src/io-threads.c b/xlators/performance/io-threads/src/io-threads.c
index 79845316315..06ad0c2aae5 100644
--- a/xlators/performance/io-threads/src/io-threads.c
+++ b/xlators/performance/io-threads/src/io-threads.c
@@ -173,7 +173,6 @@ iot_worker (void *data)
                                         break;
                                 }
 
-                                conf->sleep_count++;
                                 clock_gettime (CLOCK_REALTIME_COARSE,
                                                &sleep_till);
                                 sleep_till.tv_sec += conf->idle_time;
-- 
cgit