Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp846821pxb; Thu, 19 Aug 2021 12:45:54 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzXisyAIQ2KzQaMz9EkSfo6e7qMM9eD3WfEOYpqasjNvSMOqle0mBaVjms9a0cCOv19Me2S X-Received: by 2002:a17:906:445:: with SMTP id e5mr17659376eja.497.1629402353769; Thu, 19 Aug 2021 12:45:53 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629402353; cv=none; d=google.com; s=arc-20160816; b=h1wmC286fWtoQMDcnhW5CLLQJwom80KILgiUyRu+XEzoS8IhYMtjmsG/ome0j0Jg1k dgPwv+yCH44NVbWb3hl4Il6O0t3WGpH9uHKIRRqBRiVlnIeEsoIdgsRqFkbNq39IUy2r lNjHi/hYfTPWbWDtKCZopXJD0+JoCEH0WgqOk/v66AaioHgZcei+REDUIzCsQD09TpWl jGmbZaWHCH5uZAvZutPIdr8DjLXxlBJlu6M1Xy98ag0lrtkRfwVQSeYllQDX+KIXusri +kDuZXCjT5IhR+LX4d6rY4LBvVEimGWiyhseSFiMbCZJSmXNgK/SlLXzA93Z+hiSmyfg wupA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=gFRdiyPuactUcLg/wErn/XbBvh4nZFvYbNfA2glabKM=; b=PLRD0CzcQEkfIadfi0CACuVI3+t2sdO5qCxFq76epKp0Eij0bt2Ryy0yiGm0zZlyyQ Sxd8M5J8ZFw9k/qMh87xZFVRjNVd0rVTkcYN15Q/iww2hHW48qASUUTWHk3r48jxtQVp aB3D1fkmtWCtHTBnOPAktijSYdUcXDy7XKVzURM1J3WSxQ3XKjryi7ftl7h1VHhWZdEs 8UmzsOYUF3Y4fVDI7HmM5Cr3ldc68ekuFHuz6D+zuzIeXjGlTxxtDG0fMDTSpkkYYWBQ enFyMZC1QL/o/tRsaE4Aig4BON6/6k5L33mc3uarejSsNHGcjp1KgkM+IPlzeqL07kRo pDBw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UU3o24I3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id hk18si4276425ejb.238.2021.08.19.12.45.29; Thu, 19 Aug 2021 12:45:53 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=UU3o24I3; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=redhat.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S234859AbhHSTma (ORCPT + 99 others); Thu, 19 Aug 2021 15:42:30 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:32902 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235154AbhHSTmY (ORCPT ); Thu, 19 Aug 2021 15:42:24 -0400 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1629402106; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=gFRdiyPuactUcLg/wErn/XbBvh4nZFvYbNfA2glabKM=; b=UU3o24I3YmJQEv4RqqZO1A5pFuehJJtIjsuyg1kskP07C9RItDHRGvrEfH9lAFnhTLr8uj rskRRe+t88Fwe0oNC5bEU6FQb7UCRCg2BM9nAtmgHWSpbMmuFTo73N0GmlHE1S2I/BLzXD vy0BSpGFRYRq9KaJNN33f2LcSxlzGxM= Received: from mimecast-mx01.redhat.com (mimecast-mx01.redhat.com [209.132.183.4]) (Using TLS) by relay.mimecast.com with ESMTP id us-mta-45-wEXg2bZEP_CcuCkhD9IqXw-1; Thu, 19 Aug 2021 15:41:45 -0400 X-MC-Unique: wEXg2bZEP_CcuCkhD9IqXw-1 Received: from smtp.corp.redhat.com (int-mx03.intmail.prod.int.phx2.redhat.com [10.5.11.13]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by mimecast-mx01.redhat.com (Postfix) with ESMTPS id 86B0B801AC5; Thu, 19 Aug 2021 19:41:43 +0000 (UTC) Received: from max.com (unknown [10.40.194.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 9142760938; Thu, 19 Aug 2021 19:41:40 +0000 (UTC) From: Andreas Gruenbacher To: Linus Torvalds , Alexander Viro , Christoph Hellwig , "Darrick J. Wong" Cc: Jan Kara , Matthew Wilcox , cluster-devel@redhat.com, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org, ocfs2-devel@oss.oracle.com, Bob Peterson Subject: [PATCH v6 09/19] gfs2: Remove redundant check from gfs2_glock_dq Date: Thu, 19 Aug 2021 21:40:52 +0200 Message-Id: <20210819194102.1491495-10-agruenba@redhat.com> In-Reply-To: <20210819194102.1491495-1-agruenba@redhat.com> References: <20210819194102.1491495-1-agruenba@redhat.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Scanned-By: MIMEDefang 2.79 on 10.5.11.13 Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org From: Bob Peterson In function gfs2_glock_dq, it checks to see if this is the fast path. Before this patch, it checked both "find_first_holder(gl) == NULL" and list_empty(&gl->gl_holders), which is redundant. If gl_holders is empty then find_first_holder must return NULL. This patch removes the redundancy. Signed-off-by: Bob Peterson --- fs/gfs2/glock.c | 11 +++++------ 1 file changed, 5 insertions(+), 6 deletions(-) diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index fd280b6c37ce..f24db2ececfb 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -1514,12 +1514,11 @@ void gfs2_glock_dq(struct gfs2_holder *gh) list_del_init(&gh->gh_list); clear_bit(HIF_HOLDER, &gh->gh_iflags); - if (find_first_holder(gl) == NULL) { - if (list_empty(&gl->gl_holders) && - !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && - !test_bit(GLF_DEMOTE, &gl->gl_flags)) - fast_path = 1; - } + if (list_empty(&gl->gl_holders) && + !test_bit(GLF_PENDING_DEMOTE, &gl->gl_flags) && + !test_bit(GLF_DEMOTE, &gl->gl_flags)) + fast_path = 1; + if (!test_bit(GLF_LFLUSH, &gl->gl_flags) && demote_ok(gl)) gfs2_glock_add_to_lru(gl); -- 2.26.3