From patchwork Wed Nov 6 12:35:39 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13864782 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from kanga.kvack.org (kanga.kvack.org [205.233.56.17]) by smtp.lore.kernel.org (Postfix) with ESMTP id 59C5DD44D54 for ; Wed, 6 Nov 2024 12:38:14 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id E0D996B00A8; Wed, 6 Nov 2024 07:38:13 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id DBE746B00C2; Wed, 6 Nov 2024 07:38:13 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id C5DAD6B00C3; Wed, 6 Nov 2024 07:38:13 -0500 (EST) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0013.hostedemail.com [216.40.44.13]) by kanga.kvack.org (Postfix) with ESMTP id A49866B00A8 for ; Wed, 6 Nov 2024 07:38:13 -0500 (EST) Received: from smtpin02.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay01.hostedemail.com (Postfix) with ESMTP id 62DB11C7855 for ; Wed, 6 Nov 2024 12:38:13 +0000 (UTC) X-FDA: 82755622488.02.B27807A Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf16.hostedemail.com (Postfix) with ESMTP id 8938B180026 for ; Wed, 6 Nov 2024 12:37:37 +0000 (UTC) Authentication-Results: imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JkfZLqmq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1730896568; a=rsa-sha256; cv=none; b=unO85ncaVTfnJXYr7PyHdoCoZ//TvuFzRQvJV5D+pDyf9QeH5ReDK8UJQjHkTUMb60zHfn egmBz6ZokFx0A+F2akD/67eGNES1dp1Vf6u0iT64hyrfwRMEPmVJhMpCmGmriwj1UCKtIo d07t0yEVFy34eU29z+1R2Vhfy/rXKcI= ARC-Authentication-Results: i=1; imf16.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=JkfZLqmq; dmarc=pass (policy=none) header.from=redhat.com; spf=pass (imf16.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1730896568; h=from:from:sender:reply-to:subject:subject:date:date: message-id:message-id:to:to:cc:cc:mime-version:mime-version: content-type:content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references:dkim-signature; bh=HO1trrAUxh6ged928OSrE9rZIbGVfYli8k1F5yQtGbY=; b=OgI8+3iEe3JGuz4j+wmsOL6kW32RB0J7vJ1UTmj+9ApZ/E758Z7DpjxYxYdel9mz9d20Xz UmU4tx220icbL6hSroc/BfJyvgVbFj6/tQZjC8Oogni3vJnKglxxjDQbsgpNZpb1QH7ips xowpdGRyU72NTFh9fQ0dg3XOYycQXys= DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1730896691; 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=HO1trrAUxh6ged928OSrE9rZIbGVfYli8k1F5yQtGbY=; b=JkfZLqmqmV4MLDWjoGQ9WUUdlWTAz6NquwNOuvYvdqG3nItv/jrM03kJUk4KUr9qSs2+Ef Vxlay8MJRaJ8ktUfvqpKOzvj+4oZwlndB5qfLYmlv6KIbRTW90W1kNfQuL/w0NOoKqKUMk 5nsd80ph7lJXUmR/vTRHy9Z0bo2AIS4= Received: from mx-prod-mc-02.mail-002.prod.us-west-2.aws.redhat.com (ec2-54-186-198-63.us-west-2.compute.amazonaws.com [54.186.198.63]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-550-aT72E-SrNJek_Ct0HQie_w-1; Wed, 06 Nov 2024 07:38:07 -0500 X-MC-Unique: aT72E-SrNJek_Ct0HQie_w-1 X-Mimecast-MFC-AGG-ID: aT72E-SrNJek_Ct0HQie_w Received: from mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.15]) (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-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id DBA8B195608A; Wed, 6 Nov 2024 12:38:04 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-02.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id 5345E1956088; Wed, 6 Nov 2024 12:37:59 +0000 (UTC) From: David Howells To: Christian Brauner , Steve French , Matthew Wilcox Cc: David Howells , Jeff Layton , Gao Xiang , Dominique Martinet , Marc Dionne , Paulo Alcantara , Shyam Prasad N , Tom Talpey , Eric Van Hensbergen , Ilya Dryomov , netfs@lists.linux.dev, linux-afs@lists.infradead.org, linux-cifs@vger.kernel.org, linux-nfs@vger.kernel.org, ceph-devel@vger.kernel.org, v9fs@lists.linux.dev, linux-erofs@lists.ozlabs.org, linux-fsdevel@vger.kernel.org, linux-mm@kvack.org, netdev@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v3 15/33] afs: Fix directory format encoding struct Date: Wed, 6 Nov 2024 12:35:39 +0000 Message-ID: <20241106123559.724888-16-dhowells@redhat.com> In-Reply-To: <20241106123559.724888-1-dhowells@redhat.com> References: <20241106123559.724888-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.15 X-Rspamd-Queue-Id: 8938B180026 X-Stat-Signature: yu4eaq4q5519mgkp1bxuzsiyhpanm5zy X-Rspam-User: X-Rspamd-Server: rspam05 X-HE-Tag: 1730896657-739044 X-HE-Meta: U2FsdGVkX19qoLM5H7E6R0vUwmpu3hr8bpSh/NyDaDGK/6doqGhIK/t2OjJU+P32XiN4df+vvQtCb+k4lSM+ambBom3SKsBCS6JyiD3cS2Tq5tjw+6Rs8V44Mmz++aZyJfqLKp9icEtKyzCjl84ihbLb1Tmy9tKWLV6x5FtB2ybCRZz+UgHIj4NTwEGwm1sa4Stc6WFy8SQsMlpYIeZP0uRxcJzKmiTU96MS+Dvc754EWBn4D1enpYiFkn6e+9ILYkAB99dkGWwAdVdAnFBDDxcN5kZ8IzR2VFV13BeR7TIreVtIkviAWCc+3pkKd8shUbPctadoVhTMTJ1zeB8vKeRgsZe+NiFJY+qR+2TczuhnboFfPdBDL8bubddmplTMNEfmuJbAU7k8XOSOI9qeZyrCia9AjsWhBPp5P6hZ9GWTv+ELKDpOLuMUmKsk+FQrrf2oyRuUcJyyE1D+YF7x51wmBIN7zUqgemwwgA2AwnKw4j7+g0b8X4FUTqih8l+Ellbrt9hORgJO1qxoY2S09x0DiIRTbLxzHp8yehWlHBIv3dXuEF0nTgCJc3iW1CoMXpc/KfjKVVE/9LCd4edPv1DhvZ0yJP59wNhJ+OkRUeRPGtBz1SYLUmLQ6LmOO5BiEIfv+9L9ooAFdWUQbmj5JDd9xZWP5Os5ddhLtU5YOhHlaEDqnp+Qj6UOjao//+uNm1w92X6L1UayASOmE7Ch+YsPawi8cPoGi2mK3n+C5KtQisnHg6EK7R3IiBfxKV0xBlGutz5TTnPQJZKDxUrxMcKlBXN6HnIhHk2imt06pl8m7VtmmIYlEq56C2vHTTiUFV5pW6icgRawKXnoqV8NepQVZgUu3ewyIyi/BFIrayAWFVxxpZd9zxkItQWuOFmEXOtoOqW6x5tK5U43jHTlmgXmJnQQAoEfmIB1RehM6vZ/Z4Xxb3JN0gu83QKisySPAX7zWyegoB32UiNCaUX ZzXG7/VG +l6REDrMgbQ3wM6j/EqPb25Phjg9XEjkMYMtwT6uUDcPR4m8tqYqKM3wlgqoDrPjoa2P2xV6IA8+Alsm9CRUx5J7jNnq9amkFjdOO2OQLxZb8d5C9sF9mFbkRIY01GK/OOFE+uBSd6K0dOa0y2BsG/9pqQIgJN8Ej9K4v6/tgaxWWtNTCfUvsmmMFG52HDU8g6UjQg8J0UdhTMNW7GkGAeuotw6IP7nFRGfJY5maY8RZGLkcn9y/pUIV1YfcqN0j25uEhojAcdPo8EAr1KPJg2ABTN0mGz9Z/ChE/oNbrMtQ6tjAvXlT3KCY9eqbwykZu1+HYSgm8mmP81FtBc5kUtcvMp4+kqgzURNXumI3ENHfFOos2QXpsDai3XSCET4fOHTtPzJmrOgEu8SRDY7d7epcGTqJ5eFHty5IemxIA9XBS2P5zHs2XF0IbNiT+2dMwucZAIeVp0RFQZX4KsGtBnOJZ5lOc4fJ/w+d9GSKZjmmWACq7nbtoH+sMSPGtWAYMZR+WkTtdhpkEI2I= X-Bogosity: Ham, tests=bogofilter, spamicity=0.000000, version=1.2.4 Sender: owner-linux-mm@kvack.org Precedence: bulk X-Loop: owner-majordomo@kvack.org List-ID: List-Subscribe: List-Unsubscribe: The AFS directory format structure, union afs_xdr_dir_block::meta, has too many alloc counter slots declared and so pushes the hash table along and over the data. This doesn't cause a problem at the moment because I'm currently ignoring the hash table and only using the correct number of alloc_ctrs in the code anyway. In future, however, I should start using the hash table to try and speed up afs_lookup(). Fix this by using the correct constant to declare the counter array. Fixes: 4ea219a839bf ("afs: Split the directory content defs into a header") Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org --- fs/afs/xdr_fs.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/fs/afs/xdr_fs.h b/fs/afs/xdr_fs.h index 8ca868164507..cc5f143d21a3 100644 --- a/fs/afs/xdr_fs.h +++ b/fs/afs/xdr_fs.h @@ -88,7 +88,7 @@ union afs_xdr_dir_block { struct { struct afs_xdr_dir_hdr hdr; - u8 alloc_ctrs[AFS_DIR_MAX_BLOCKS]; + u8 alloc_ctrs[AFS_DIR_BLOCKS_WITH_CTR]; __be16 hashtable[AFS_DIR_HASHTBL_SIZE]; } meta;