Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1162396AbbKFUVn (ORCPT ); Fri, 6 Nov 2015 15:21:43 -0500 Received: from mail.linuxfoundation.org ([140.211.169.12]:47674 "EHLO mail.linuxfoundation.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1161731AbbKFTcG (ORCPT ); Fri, 6 Nov 2015 14:32:06 -0500 From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Akinobu Mita , Andrew Morton , Linus Torvalds Subject: [PATCH 4.1 26/86] fault-inject: fix inverted interval/probability values in printk Date: Fri, 6 Nov 2015 11:22:25 -0800 Message-Id: <20151106192206.689511855@linuxfoundation.org> X-Mailer: git-send-email 2.6.2 In-Reply-To: <20151106192205.351595349@linuxfoundation.org> References: <20151106192205.351595349@linuxfoundation.org> User-Agent: quilt/0.64 MIME-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-15 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Content-Length: 1328 Lines: 38 4.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Florian Westphal commit bb387002693ed28b2bb0408c5dec65521b71e5f1 upstream. interval displays the probability and vice versa. Fixes: 6adc4a22f20bb ("fault-inject: add ratelimit option") Acked-by: Akinobu Mita Signed-off-by: Andrew Morton Signed-off-by: Linus Torvalds Signed-off-by: Greg Kroah-Hartman --- lib/fault-inject.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -44,7 +44,7 @@ static void fail_dump(struct fault_attr printk(KERN_NOTICE "FAULT_INJECTION: forcing a failure.\n" "name %pd, interval %lu, probability %lu, " "space %d, times %d\n", attr->dname, - attr->probability, attr->interval, + attr->interval, attr->probability, atomic_read(&attr->space), atomic_read(&attr->times)); if (attr->verbose > 1) -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/