From nobody Mon Feb 9 16:45:54 2026 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 8AE841DDC35 for ; Wed, 29 Jan 2025 14:34:09 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.133.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738161251; cv=none; b=JxCA/Wok8glTpkyD/cO/yKDwRrf7UwJo4PdxwBOOXQZ/b89U43XbqhiSNeQdN+m047v+Qqg7G/pN+oTQbuez1IHNsmIg+AicYcqrmVl+HgUwg1vho98Tr6EkurVqNxDmZalv1WfbU01vGI3hurQoVp/k0n9LK9H3vR/+9TQ126s= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1738161251; c=relaxed/simple; bh=ygwAQBWML1tmKhXOycj3SmWBSx72h3X+STM8yQsxciw=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=unqDCnLFgH3oyUFxz49V5r0lZpWwhi6L7uBvW4/G6bW+Hud/n7Hxx6wEtozUAMP/zLAFqV2M/KUUN54Bq9M/S3MOeuMU04AaGFW2hrXT/6afYKYwyPnHKhmF+SxGqkPxcKJCVJaquDSdgI8sTfnB11Q2Z3ZgMoN9RBPcWgq7Cu4= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com; spf=pass smtp.mailfrom=redhat.com; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b=Lac7n6+i; arc=none smtp.client-ip=170.10.133.124 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=redhat.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=redhat.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=redhat.com header.i=@redhat.com header.b="Lac7n6+i" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1738161248; 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=74dydNQetms/bGYetTVmJaGxaCOgtJUS+5wTgNyYG0Y=; b=Lac7n6+i9q+NM3NR+4T0tNwc5ToQWIr1GMCuEF8/C87IsROA8xd1/uH4/HUrKSGhY0nRY/ ukpQ8rftypFseXchEVkOm43LTd6x2HG2soZI7Fp39YLVW2FU2lJMZtEuqrX95CNLJH3fp2 yceQb9qm26at8QGWg8vbqLlp09UaIEU= Received: from mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (ec2-35-165-154-97.us-west-2.compute.amazonaws.com [35.165.154.97]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-198-kgxk55RYPnGOzbegLQNvdA-1; Wed, 29 Jan 2025 09:34:04 -0500 X-MC-Unique: kgxk55RYPnGOzbegLQNvdA-1 X-Mimecast-MFC-AGG-ID: kgxk55RYPnGOzbegLQNvdA Received: from mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.111]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by mx-prod-mc-06.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4D52E180034D; Wed, 29 Jan 2025 14:34:03 +0000 (UTC) Received: from pasta.fast.eng.rdu2.dc.redhat.com (unknown [10.45.224.234]) by mx-prod-int-08.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id F3B611800951; Wed, 29 Jan 2025 14:34:00 +0000 (UTC) From: Andreas Gruenbacher To: Christian Brauner Cc: Andreas Gruenbacher , Christoph Hellwig , gfs2@lists.linux.dev, linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH 2/3] gfs2: switch to lockref_init(..., 1) Date: Wed, 29 Jan 2025 15:33:51 +0100 Message-ID: <20250129143353.1892423-3-agruenba@redhat.com> In-Reply-To: <20250129143353.1892423-1-agruenba@redhat.com> References: <20250129143353.1892423-1-agruenba@redhat.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Scanned-By: MIMEDefang 3.4.1 on 10.30.177.111 Content-Type: text/plain; charset="utf-8" In qd_alloc(), initialize the lockref count to 1 to cover the common case. Compensate for that in gfs2_quota_init() by adjusting the count back down to 0; this only occurs when mounting the filesystem rw. Signed-off-by: Andreas Gruenbacher Reviewed-by: Christoph Hellwig --- fs/gfs2/quota.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/fs/gfs2/quota.c b/fs/gfs2/quota.c index 58bc5013ca49..6ae529a5388b 100644 --- a/fs/gfs2/quota.c +++ b/fs/gfs2/quota.c @@ -236,7 +236,7 @@ static struct gfs2_quota_data *qd_alloc(unsigned hash, = struct gfs2_sbd *sdp, str return NULL; =20 qd->qd_sbd =3D sdp; - lockref_init(&qd->qd_lockref, 0); + lockref_init(&qd->qd_lockref, 1); qd->qd_id =3D qid; qd->qd_slot =3D -1; INIT_LIST_HEAD(&qd->qd_lru); @@ -297,7 +297,6 @@ static int qd_get(struct gfs2_sbd *sdp, struct kqid qid, spin_lock_bucket(hash); *qdp =3D qd =3D gfs2_qd_search_bucket(hash, sdp, qid); if (qd =3D=3D NULL) { - new_qd->qd_lockref.count++; *qdp =3D new_qd; list_add(&new_qd->qd_list, &sdp->sd_quota_list); hlist_bl_add_head_rcu(&new_qd->qd_hlist, &qd_hash_table[hash]); @@ -1450,6 +1449,7 @@ int gfs2_quota_init(struct gfs2_sbd *sdp) if (qd =3D=3D NULL) goto fail_brelse; =20 + qd->qd_lockref.count =3D 0; set_bit(QDF_CHANGE, &qd->qd_flags); qd->qd_change =3D qc_change; qd->qd_slot =3D slot; --=20 2.48.1