From patchwork Wed Jan 9 06:24:02 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: NeilBrown X-Patchwork-Id: 10753475 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 404116C2 for ; Wed, 9 Jan 2019 06:26:52 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 2D66928E17 for ; Wed, 9 Jan 2019 06:26:52 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2146E28E1A; Wed, 9 Jan 2019 06:26:52 +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=-2.3 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE,URG_BIZ autolearn=ham version=3.3.1 Received: from pdx1-mailman02.dreamhost.com (pdx1-mailman02.dreamhost.com [64.90.62.194]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id CA85D28E17 for ; Wed, 9 Jan 2019 06:26:51 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id EA73121FD40; Tue, 8 Jan 2019 22:26:31 -0800 (PST) X-Original-To: lustre-devel@lists.lustre.org Delivered-To: lustre-devel-lustre.org@pdx1-mailman02.dreamhost.com Received: from mx1.suse.de (mx2.suse.de [195.135.220.15]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id C830421FBA4 for ; Tue, 8 Jan 2019 22:26:29 -0800 (PST) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay2.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 09BD2AF0B; Wed, 9 Jan 2019 06:26:29 +0000 (UTC) From: NeilBrown To: James Simmons , Oleg Drokin , Andreas Dilger Date: Wed, 09 Jan 2019 17:24:02 +1100 Message-ID: <154701504202.26726.9471170836147674405.stgit@noble> In-Reply-To: <154701488711.26726.17363928508883972338.stgit@noble> References: <154701488711.26726.17363928508883972338.stgit@noble> User-Agent: StGit/0.17.1-dirty MIME-Version: 1.0 Subject: [lustre-devel] [PATCH 15/29] lustre: osc_cache: change osc_make_rpc() to return bool. X-BeenThere: lustre-devel@lists.lustre.org X-Mailman-Version: 2.1.23 Precedence: list List-Id: "For discussing Lustre software development." List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: Lustre Development List Errors-To: lustre-devel-bounces@lists.lustre.org Sender: "lustre-devel" X-Virus-Scanned: ClamAV using ClamSMTP 'bool' more accurately reflects the nature of this function. Signed-off-by: NeilBrown --- drivers/staging/lustre/lustre/osc/osc_cache.c | 28 +++++++++++++------------ 1 file changed, 14 insertions(+), 14 deletions(-) diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c index ddfb61502f30..9b78562d3366 100644 --- a/drivers/staging/lustre/lustre/osc/osc_cache.c +++ b/drivers/staging/lustre/lustre/osc/osc_cache.c @@ -1665,10 +1665,10 @@ static int osc_max_rpc_in_flight(struct client_obd *cli, struct osc_object *osc) * (lop). This is used by osc_check_rpcs->osc_next_obj() and osc_list_maint() * to quickly find objects that are ready to send an RPC. */ -static int osc_makes_rpc(struct client_obd *cli, struct osc_object *osc, - int cmd) +static bool osc_makes_rpc(struct client_obd *cli, struct osc_object *osc, + int cmd) { - int invalid_import = 0; + bool invalid_import = false; /* if we have an invalid import we want to drain the queued pages * by forcing them through rpcs that immediately fail and complete @@ -1676,22 +1676,22 @@ static int osc_makes_rpc(struct client_obd *cli, struct osc_object *osc, * before canceling the locks and evicting down the llite pages */ if (!cli->cl_import || cli->cl_import->imp_invalid) - invalid_import = 1; + invalid_import = true; if (cmd & OBD_BRW_WRITE) { if (atomic_read(&osc->oo_nr_writes) == 0) - return 0; + return false; if (invalid_import) { CDEBUG(D_CACHE, "invalid import forcing RPC\n"); - return 1; + return true; } if (!list_empty(&osc->oo_hp_exts)) { CDEBUG(D_CACHE, "high prio request forcing RPC\n"); - return 1; + return true; } if (!list_empty(&osc->oo_urgent_exts)) { CDEBUG(D_CACHE, "urgent request forcing RPC\n"); - return 1; + return true; } /* trigger a write rpc stream as long as there are dirtiers * waiting for space. as they're waiting, they're not going to @@ -1699,25 +1699,25 @@ static int osc_makes_rpc(struct client_obd *cli, struct osc_object *osc, */ if (waitqueue_active(&cli->cl_cache_waiters)) { CDEBUG(D_CACHE, "cache waiters forcing RPC\n"); - return 1; + return true; } if (!list_empty(&osc->oo_full_exts)) { CDEBUG(D_CACHE, "full extent ready, make an RPC\n"); - return 1; + return true; } } else { if (atomic_read(&osc->oo_nr_reads) == 0) - return 0; + return false; if (invalid_import) { CDEBUG(D_CACHE, "invalid import forcing RPC\n"); - return 1; + return true; } /* all read are urgent. */ if (!list_empty(&osc->oo_reading_exts)) - return 1; + return true; } - return 0; + return false; } static void osc_update_pending(struct osc_object *obj, int cmd, int delta)