Received: by 2002:a25:8b91:0:0:0:0:0 with SMTP id j17csp755224ybl; Wed, 4 Dec 2019 10:18:32 -0800 (PST) X-Google-Smtp-Source: APXvYqy5uMZ/xkOg7q6qtL8QHwULhqOKBLSHYoxuZ0X04VLNxR9PUIXL+XsxcoikPAEKQRfpfyTR X-Received: by 2002:a9d:19ed:: with SMTP id k100mr3610413otk.297.1575483511752; Wed, 04 Dec 2019 10:18:31 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1575483511; cv=none; d=google.com; s=arc-20160816; b=Y5Fdes9R6gxOefcPgsBJJEKuxCbpzVlh7f/ZOVPy7KYZwfZa6+XVHeFaYAn/99aZav uTuuVj3lOvHaGBqSMnM7UUOtHGlKaIq8ckcyFnG74QvYrhwd0B6rNua6qJ/FCq+ceKrG sFsPU+EOdHZSKYMNL6yp1JVVXzH1HvYF9HTBPsGF/dSSawqSFAs/NtajdnZ7XifcPqRL U2SNkFL01RbPP8+lscewFGBqdUk/Dj4arIx3yM3omiSY+ynvHDkgtQBGCy0ex7KtQmdq CSCSFQQ7IhF8nGqqzitmhvu6sHBlBwY7JATVrQiZCt1kIk3IkMUJZiLpYHL5pJzgva+7 y6cQ== 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=M68ATkBR4cxMnCaqu+MuRwi9fQEhI4bIXgd21dlQKws=; b=n31rAH8g/VCCQWL+pg91xwC35CNyLKNdFHnDaN3R+0V/oT5RF7hGNyxmQhJW4UQ2L3 IO9SYCbh9H5wwiX4r549UiSIRkd4DrzgLCuWvlq8fL+MfC28nXp/qWl4jFhXNe2TfcAG mw0A/YAyOQsUfQOzaV+itLrl40Cyi5TDCifur9BegqslTvf0sshyN1s5/68jejCmI1ZW tNWZ3DRod9B3xCToVA4CNalwF9WbNkzttVn0FO0zw9lZwBgug+OMEc+AW78P5uyhjf1p egrFnQAyN6TBjXUosJZoBDeYXzsP1Xnh9XoM5bB47HurOq9AQgt6w4TInQLVeF35CMYV 1B1w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@kernel.org header.s=default header.b="1i/JrDxe"; 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 x126si3573497oix.53.2019.12.04.10.18.12; Wed, 04 Dec 2019 10:18:31 -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="1i/JrDxe"; 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 S1731597AbfLDSM1 (ORCPT + 99 others); Wed, 4 Dec 2019 13:12:27 -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: 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 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