'ioping -w' was going over the time limit specified. For example,

'ioping -w 7 -i 2' was taking 8 seconds to run, not 7 or less.
Fix it by moving the check to before usleep(), and taking
the interval (ie usleep argument) into account.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>

ioping.c

@@ -466,7 +466,7 @@ int main (int argc, char **argv)
 		if (count && request >= count)
 			break;
 
-		if (deadline && now() >= deadline)
+		if (deadline && now() + interval >= deadline)
 			break;
 
 		usleep(interval);