From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-9.8 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,HEADER_FROM_DIFFERENT_DOMAINS,INCLUDES_PATCH,MAILING_LIST_MULTI, SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS,USER_AGENT_GIT autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 67E5CC2BD09 for ; Wed, 4 Dec 2019 18:12:26 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id 3971F20674 for ; Wed, 4 Dec 2019 18:12:26 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483146; bh=L6UADT7WrITQLvYS1P2NX/sJ3asPZ165Aiv3SC8XTnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-ID:From; b=v4XX9eZw90Pd04HYnsJGsBYPZvaEiPGjcsmCXCzYRusijgem8m6L/5OnZIRQR/u5o 5BWLnUIzU1AwTuF+++ZIWB/EbeAGRlkpgSIlVkSyzBozrAFEydyk/4K9IpJ7R4D4WD zP6C9jTZnModvk2lNJwfRCOcz5dg+5FJbZeOO9Iw= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1731279AbfLDSMZ (ORCPT ); Wed, 4 Dec 2019 13:12:25 -0500 Received: from mail.kernel.org ([198.145.29.99]:40998 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1731275AbfLDSMX (ORCPT ); Wed, 4 Dec 2019 13:12:23 -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 1BC5B20863; Wed, 4 Dec 2019 18:12:21 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1575483142; bh=L6UADT7WrITQLvYS1P2NX/sJ3asPZ165Aiv3SC8XTnE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=1i/JrDxembapw1dOx///hMb23FPTEeUSRpIJN/AJBQbiDF06F+4ZVtzSACo9bcmmB rnUIJLZ4Yb6Un9olCUD83Qlh4Bp+dRgTQ2Q/bxOnfkjJvqKfkmSDB3+sV6PYScPC/4 6jgPBIMdseDJQynaMrqfsI00+d4XSdKXCNcX/xPY= 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.9 068/125] drbd: fix print_st_err()s prototype to match the definition Date: Wed, 4 Dec 2019 18:56:13 +0100 Message-Id: <20191204175323.115959543@linuxfoundation.org> X-Mailer: git-send-email 2.24.0 In-Reply-To: <20191204175308.377746305@linuxfoundation.org> References: <20191204175308.377746305@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Sender: stable-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: stable@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 6c9d5d4a8a753..110f64d9e91c1 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_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