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: 10753481 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 78A6317D2 for ; Wed, 9 Jan 2019 06:27:04 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 67BFE28E17 for ; Wed, 9 Jan 2019 06:27:04 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 5C0CE28E1A; Wed, 9 Jan 2019 06:27:04 +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.9 required=2.0 tests=BAYES_00,MAILING_LIST_MULTI, RCVD_IN_DNSWL_NONE 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 1D5FF28E17 for ; Wed, 9 Jan 2019 06:27:04 +0000 (UTC) Received: from pdx1-mailman02.dreamhost.com (localhost [IPv6:::1]) by pdx1-mailman02.dreamhost.com (Postfix) with ESMTP id 3A37B682047; Tue, 8 Jan 2019 22:26:49 -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 7601121F596 for ; Tue, 8 Jan 2019 22:26:47 -0800 (PST) X-Virus-Scanned: by amavisd-new at test-mx.suse.de Received: from relay1.suse.de (unknown [195.135.220.254]) by mx1.suse.de (Postfix) with ESMTP id 92AA9AF0B; Wed, 9 Jan 2019 06:26:46 +0000 (UTC) From: NeilBrown To: James Simmons , Oleg Drokin , Andreas Dilger Date: Wed, 09 Jan 2019 17:24:02 +1100 Message-ID: <154701504226.26726.13771066469284363266.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 18/29] lustre: osc_cache: avoid unnecessary tests. 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 These tests (have we reached page limit) are not necessary, as the next call to try_to_add_extent_for_io() will perform the same test, and fail if necessary. Having the tests don't add any clarity to the code, and are unlikely to help performance as they are likely to fail more often than they succeed. So discard them. Signed-off-by: NeilBrown --- drivers/staging/lustre/lustre/osc/osc_cache.c | 6 ------ 1 file changed, 6 deletions(-) diff --git a/drivers/staging/lustre/lustre/osc/osc_cache.c b/drivers/staging/lustre/lustre/osc/osc_cache.c index 14e6efb4b80b..5666f384ac6c 100644 --- a/drivers/staging/lustre/lustre/osc/osc_cache.c +++ b/drivers/staging/lustre/lustre/osc/osc_cache.c @@ -1990,8 +1990,6 @@ static unsigned int get_write_extents(struct osc_object *obj, return data.erd_page_count; EASSERT(ext->oe_nr_pages <= data.erd_max_pages, ext); } - if (data.erd_page_count == data.erd_max_pages) - return data.erd_page_count; while (!list_empty(&obj->oo_urgent_exts)) { ext = list_entry(obj->oo_urgent_exts.next, @@ -1999,8 +1997,6 @@ static unsigned int get_write_extents(struct osc_object *obj, if (!try_to_add_extent_for_io(cli, ext, &data)) return data.erd_page_count; } - if (data.erd_page_count == data.erd_max_pages) - return data.erd_page_count; /* * One key difference between full extents and other extents: full @@ -2015,8 +2011,6 @@ static unsigned int get_write_extents(struct osc_object *obj, if (!try_to_add_extent_for_io(cli, ext, &data)) break; } - if (data.erd_page_count == data.erd_max_pages) - return data.erd_page_count; ext = first_extent(obj); while (ext) {