From patchwork Thu Nov 15 01:19:46 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Eric Biggers X-Patchwork-Id: 10683405 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 4C432109C for ; Thu, 15 Nov 2018 01:20:57 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 36A112C09F for ; Thu, 15 Nov 2018 01:20:57 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2B0B02C09D; Thu, 15 Nov 2018 01:20:57 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-8.0 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,MAILING_LIST_MULTI,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id C211C2C08E for ; Thu, 15 Nov 2018 01:20:56 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726379AbeKOL0g (ORCPT ); Thu, 15 Nov 2018 06:26:36 -0500 Received: from mail.kernel.org ([198.145.29.99]:37812 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725895AbeKOL0g (ORCPT ); Thu, 15 Nov 2018 06:26:36 -0500 Received: from ebiggers.mtv.corp.google.com (unknown [104.132.1.85]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 3F0802147C; Thu, 15 Nov 2018 01:20:55 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1542244855; bh=n3H2KxvNnJ7UuRf6AxhvKhDyEp3ZMWNTbuaPuvRG5Ig=; h=From:To:Subject:Date:From; b=xUw7ikqZcu3pDu+HE4x5Bdkh21B0Cq/8TQL6PY28SM9VpaqEF9Pq4SyEATRoRzMjL ccoDbIPGP54NwrotN8bNNcKc421RwGnnd0dw11djpB8uFSlvFY1K5zzED8aLE27pxI 9h7Ph/VVIYjIBROQduDGYxjTt0cTT/d9ib1iClYw= From: Eric Biggers To: linux-block@vger.kernel.org, Jens Axboe Subject: [PATCH] block: make blk_try_req_merge() static Date: Wed, 14 Nov 2018 17:19:46 -0800 Message-Id: <20181115011946.123485-1-ebiggers@kernel.org> X-Mailer: git-send-email 2.19.1.930.g4563a0d9d0-goog MIME-Version: 1.0 Sender: linux-block-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-block@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Eric Biggers blk_try_req_merge() is only used in block/blk-merge.c, so make it static. This addresses a gcc warning when -Wmissing-prototypes is enabled. Signed-off-by: Eric Biggers --- block/blk-merge.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-merge.c b/block/blk-merge.c index e7696c47489ad..badccafc91303 100644 --- a/block/blk-merge.c +++ b/block/blk-merge.c @@ -731,7 +731,8 @@ static inline bool blk_discard_mergable(struct request *req) return false; } -enum elv_merge blk_try_req_merge(struct request *req, struct request *next) +static enum elv_merge blk_try_req_merge(struct request *req, + struct request *next) { if (blk_discard_mergable(req)) return ELEVATOR_DISCARD_MERGE;