Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp794520ybl; Wed, 4 Dec 2019 11:01:36 -0800 (PST) X-Google-Smtp-Source: APXvYqwjpRTKAgT12UAvWrh1qc2BLWrCFuskOOIoDzlc3kZ2eURiBY7cafMpsMg/v/CrYO0TQpAL X-Received: by 2002:a05:6830:15a:: with SMTP id j26mr3585369otp.137.1575486096303; Wed, 04 Dec 2019 11:01:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575486096; cv=none; d=google.com; s=arc-20160816; b=WIq7GxOZVuL+qlvH1AdMGYSEgAHEG7f+a2BW0FjGz0giguwBzypJLiFmwh3YPN9DK8 88K+FJCS0NBTEhp+3yFyRzxVBuG1IMkd89XxAXe3O7E1M4+Cvazk48HTUziNHtr4LKAX n09FpcHDU90bh1Vnd87Lc25+xRBK7F4SEtUCXdwiyy9cI0okNGWy7ri99590hOgHWI2l HFbMFfQcns3V9nZUEVUZ40qVnKGny6UJwkw54vT6274m98GnVVKPYWV/V2CkOE0+//oN /VezSepNyk1NqxvLhzBZkjdbnPe4X9DQSjfG1aNxFzHa5xXesJXnNPNtUk+vtJVD8mgp Mzyw== 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=4w1uNaKQ6aRPpFLAQNXIxG/3KVRYz0h3INyCzvBhOmY=; b=KfvhKT75lquFDXSjrJWmd0wtadFGtlKCzQrYqCjnJbIMaa/2PDVFifP8tjfx06mo7z 0sxnejIjyDUZXPnLGUG5+KviYFYnEmdnwTi70FxnE+87+Aya5wAJl2/zhJP3sOCFcKDd 9453+lwQoszJsrQWtp+ogMReAZ8PORWsRuiwF7RsfT8fgk4+XTV9u6BNQyn1VSafEAEb ufP09M0JR0dxXwnDU0+9BfrEvaG1FFwUzj0ee/xGbWinEX0ugMH6Zt/hIwN5ORzolkSv qys0/Vi3BocIHBSubXfPZH4rO8o69qVR8k2MQIVZjrUfHaqNVWRkcnn1Qtg0mTnoh/mE xJnw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b=eroMLjeC; 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 b25si3574206otp.212.2019.12.04.11.01.21; Wed, 04 Dec 2019 11:01:36 -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=eroMLjeC; 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 S1729061AbfLDR7O (ORCPT + 99 others); Wed, 4 Dec 2019 12:59:14 -0500 Received: from mail.kernel.org ([198.145.29.99]:35052 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1729029AbfLDR7J (ORCPT ); Wed, 4 Dec 2019 12:59:09 -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 F3A4220675; Wed, 4 Dec 2019 17:59:07 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575482348; bh=ZKAtWUsN0FqEAoJtA7XbheslHWVtULPIZOm3hQjh9nA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=eroMLjeCcYsUQK7qkF+z1luC2HIE1CMjfYolYS0qYGnj10OTuvOH01M2sOEzZHpTR cxAr9+Be9E5TMKs88YpPK7jx5hLMsGaZA4RiI8aqq2tGiRR8E4U9sD+hyOg2CCEV0t nLhjC/elQ/iTBvD2BAMfiwRH+T+5IG8FY4F+GyFE= 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.4 52/92] drbd: fix print_st_err()s prototype to match the definition Date: Wed, 4 Dec 2019 18:49:52 +0100 Message-Id: <20191204174333.587453832@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204174327.215426506@linuxfoundation.org> References: <20191204174327.215426506@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 7f53c40823cd5..75219cd2534aa 100644 --- a/drivers/block/drbd/drbd_state.h +++ b/drivers/block/drbd/drbd_state.h @@ -126,7 +126,7 @@ extern enum drbd_state_rv __drbd_set_state(struct drbd_device *, union drbd_stat 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