Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp741631ybl; Wed, 4 Dec 2019 10:06:37 -0800 (PST) X-Google-Smtp-Source: APXvYqw6J272RSzkgtkYeG+eyJAFpOvXDSp5bJHxYcElnWfQLq1t6nYB0ZHRJll2dIvFcPGPKiE6 X-Received: by 2002:aca:7583:: with SMTP id q125mr3894127oic.100.1575482797217; Wed, 04 Dec 2019 10:06:37 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575482797; cv=none; d=google.com; s=arc-20160816; b=Ps+rOz0W7+iIQyNmSgNtz07rqAJTQ347Qf8lI/MsZfugRePylgpbiwK/CmyMuDuARX 2PA0Pfx9ydMLHh2PKvFX+tZOV1Gw6hZYL+xkTUh4jCBaQbyMW/A7hWsOh9trUkUbq6T+ qg6ZTA8ep819hXgn/tnwm87GSvNXx3qmHEq2O0XYPAXqPlWvu9lQXORkhN6VQybnXTnY zLKVSX/t1YY1X3A2oYl7DPGXYsa9G/ro7hpF53pH3Sug0f/k1ouHOSU/R9BUJSliZgcX rFGM7mQdoCHHvZzXcv6nqTeX3hORdoz1ekIhoO/e++v+Gh8Zaf9wBYM5W1HEtmL50s2e QdzA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=m4XIJgpzhDb1NOKEpk6oN0UOdnBQdiYJvuTu/8qVZ7g=; b=aFXtjlwwFbaXNJUclLrOx1VKXAFpSdxbxg+QLsy8fpf7WLeLsm6Q9xK6xvDmBoFB7z E7bhAxq3cDDvTLcsL9RjbS9NJf4zbeV6f1du+3oUSAy0EaT6P/PJMggZNloHAg91as0n G+dm263EUaLN3KgGJmu4cLw+i4WHaEDZ8M/QenitEwyqsNUmAY2DLZczzSR9kcQRZFwJ eHH9dQOGaEz/yI4UXa8xMKEmG4oAxfuEZAmELNPVX70FI6W2/6+Gzz9YXw8mxuPnhz6Z KNifwOOs7c9jxJdjqAF3ZzN9w+z7+/aW57PXUgtE4W+mC49DUeXXYxH4t39v0aplV59m H1ng== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QzyUhg4v; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id o128si3634996oia.72.2019.12.04.10.06.25; Wed, 04 Dec 2019 10:06:37 -0800 (PST) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=QzyUhg4v; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1730328AbfLDSFI (ORCPT + 99 others); Wed, 4 Dec 2019 13:05:08 -0500 Received: from mail.kernel.org ([198.145.29.99]:51080 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1730312AbfLDSFD (ORCPT ); Wed, 4 Dec 2019 13:05:03 -0500 Received: from localhost (unknown [217.68.49.72]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id F326F20675; Wed, 4 Dec 2019 18:05:01 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482702; bh=3STd+I0ZH/0LNTU+Yvg39crAO7P5nDqtGIPmBwkDu20=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QzyUhg4vR4yWlfoL74aHnWPMXxN79beYR6EvhelpwPruTFJtkljgC1/ipfIwrer9S Oy1gdTWVkmTbshR0Ni9EASUMf+ON60fleKfEsW3X73R5pbXnfHGIy4flmTOBLllQTJ 1TrXKK5GK0Yj0t31AP7QZJbnusP0ILzm8fuO2DRw= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, Luc Van Oostenryck , Roland Kammerer , Lars Ellenberg , Jens Axboe , Sasha Levin Subject: [PATCH 4.14 102/209] drbd: fix print_st_err()s prototype to match the definition Date: Wed, 4 Dec 2019 18:55:14 +0100 Message-Id: <20191204175328.883448439@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175321.609072813@linuxfoundation.org> References: <20191204175321.609072813@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Luc Van Oostenryck [ Upstream commit 2c38f035117331eb78d0504843c79ea7c7fabf37 ] print_st_err() is defined with its 4th argument taking an 'enum drbd_state_rv' but its prototype use an int for it. Fix this by using 'enum drbd_state_rv' in the prototype too. Signed-off-by: Luc Van Oostenryck Signed-off-by: Roland Kammerer Signed-off-by: Lars Ellenberg Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- drivers/block/drbd/drbd_state.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/drivers/block/drbd/drbd_state.h b/drivers/block/drbd/drbd_state.h index ea58301d0895c..b2a390ba73a05 100644 --- a/drivers/block/drbd/drbd_state.h +++ b/drivers/block/drbd/drbd_state.h @@ -131,7 +131,7 @@ extern enum drbd_state_rv _drbd_set_state(struct drbd_device *, union drbd_state enum chg_state_flags, struct completion *done); extern void print_st_err(struct drbd_device *, union drbd_state, - union drbd_state, int); + union drbd_state, enum drbd_state_rv); enum drbd_state_rv _conn_request_state(struct drbd_connection *connection, union drbd_state mask, union drbd_state val, -- 2.20.1