Received: by 2002:a05:6a10:1d13:0:0:0:0 with SMTP id pp19csp845160pxb; Thu, 19 Aug 2021 12:43:03 -0700 (PDT) X-Google-Smtp-Source: ABdhPJyJ/p0Q4hGSOFYry7DQ4Dw6iN3WV7Ceyr7WbC4GVRkXAeLxfBuG3p8Kj3+AHn+qwQBbE6uQ X-Received: by 2002:a92:d1c6:: with SMTP id u6mr10800408ilg.263.1629402183019; Thu, 19 Aug 2021 12:43:03 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1629402183; cv=none; d=google.com; s=arc-20160816; b=YF+HgJDDUlaVkIOhV3VcO8vzpIjVvCXGUUTaitq8d2NjahSCDb3zyIQgNn3XMyKfUd HhvH9d+zs+I0K/onW3SWEl4Zsc4f0D5jEXoAaQP3Obo8pNw2sdIyUl4saSm0ym+JuTby pND/4cfkuX+bhm6nDMEiOWmChC6Y7b0g8LhRPH5BO6OxLZh/uV4KBS5xEEMDtg8SSq/m D27VQixZMnqb7XFKKzNr/f7iKbfEqJ8/dK6boFLsWT1NYmuRg2/VSg2AZABDjGOW3q9d y+TCcU3fMoOKXPUs8kdj77Fus9bmy4FGtA0g9Auaqid8t+1+4KCwAWHCigAtrMVc6K5v LsIw== 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=hlLVo70MeIlzSeNo8YqccKJkFJlfnahf31dyuu9o1Es=; b=cEVFbxQ/PS/7n56tC5hXkTasZaabr+TgaJtAJf3pLGl64apgYoasYbBic+wu9nvWxS Rt9f1LhHSMsT91Vuoz77BADYTSrak6CDUdcXwGnZs8RE9HlLoeOE+s2NBRWY71zNKOtj pAAyWXBVGWDrOKN/cbTP8GSXHAeglX/U/EgkFcoyS/iBp55lsVTk8pN40tamzHbhJN7e /Umr+4RLPj0Zjo8MnhsfpI57iew9JR+0oKK15kK/Nk00BVoWb9BPUfyDyAzf69MUWbdf M/GOjgXpESuU8XTElx0N5xtIcn+IesKAg8m9V6GC718MQdU2MzkdM7HLeTQ1xQs8ezS9 nthA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@redhat.com header.s=mimecast20190719 header.b=h1tqYqSW; 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 i23si3808465jam.111.2021.08.19.12.42.50; Thu, 19 Aug 2021 12:43:03 -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=h1tqYqSW; 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 S235052AbhHSTmY (ORCPT + 99 others); Thu, 19 Aug 2021 15:42:24 -0400 Received: from us-smtp-delivery-124.mimecast.com ([216.205.24.124]:47657 "EHLO us-smtp-delivery-124.mimecast.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S235097AbhHSTmX (ORCPT ); Thu, 19 Aug 2021 15:42:23 -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=hlLVo70MeIlzSeNo8YqccKJkFJlfnahf31dyuu9o1Es=; b=h1tqYqSWuqgrMbfQnNpqy5ttpcROo+jR0ai1zLgTjPxKoULeVGD7Z2DVMWfsfOBedk9Xj7 h20TXghIoXUsqBX8KbVVDxi8rkkEjheyPbqe1rzyc17KUmHvzMiLrkeBdMoZadnwQ5KNb3 2y/F1ntB4b7V26EhRcNG785G0YxSS44= 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-437-g0A_BYYtOzi8iNNeQxRZvg-1; Thu, 19 Aug 2021 15:41:41 -0400 X-MC-Unique: g0A_BYYtOzi8iNNeQxRZvg-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 3203E87D55C; Thu, 19 Aug 2021 19:41:40 +0000 (UTC) Received: from max.com (unknown [10.40.194.206]) by smtp.corp.redhat.com (Postfix) with ESMTP id 38E861B46B; Thu, 19 Aug 2021 19:41:37 +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 08/19] gfs2: Eliminate vestigial HIF_FIRST Date: Thu, 19 Aug 2021 21:40:51 +0200 Message-Id: <20210819194102.1491495-9-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 Holder flag HIF_FIRST is no longer used or needed, so remove it. Signed-off-by: Bob Peterson --- fs/gfs2/glock.c | 2 -- fs/gfs2/incore.h | 1 - 2 files changed, 3 deletions(-) diff --git a/fs/gfs2/glock.c b/fs/gfs2/glock.c index 545b435f55ea..fd280b6c37ce 100644 --- a/fs/gfs2/glock.c +++ b/fs/gfs2/glock.c @@ -2097,8 +2097,6 @@ static const char *hflags2str(char *buf, u16 flags, unsigned long iflags) *p++ = 'H'; if (test_bit(HIF_WAIT, &iflags)) *p++ = 'W'; - if (test_bit(HIF_FIRST, &iflags)) - *p++ = 'F'; *p = 0; return buf; } diff --git a/fs/gfs2/incore.h b/fs/gfs2/incore.h index e6f820f146cb..5c6b985254aa 100644 --- a/fs/gfs2/incore.h +++ b/fs/gfs2/incore.h @@ -253,7 +253,6 @@ struct gfs2_lkstats { enum { /* States */ HIF_HOLDER = 6, /* Set for gh that "holds" the glock */ - HIF_FIRST = 7, HIF_WAIT = 10, }; -- 2.26.3