From patchwork Thu Oct 24 14:05:12 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13849108 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 9CEB7CE8E7B for ; Thu, 24 Oct 2024 14:07:55 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 3B3728D0001; Thu, 24 Oct 2024 10:07:55 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 363566B00BC; Thu, 24 Oct 2024 10:07:55 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 203C48D0001; Thu, 24 Oct 2024 10:07:55 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0012.hostedemail.com [216.40.44.12]) by kanga.kvack.org (Postfix) with ESMTP id F3D126B00BA for ; Thu, 24 Oct 2024 10:07:54 -0400 (EDT) Received: from smtpin22.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay02.hostedemail.com (Postfix) with ESMTP id ED9D81212BE for ; Thu, 24 Oct 2024 14:07:37 +0000 (UTC) X-FDA: 82708673964.22.8897F5D Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf09.hostedemail.com (Postfix) with ESMTP id E83A9140026 for ; Thu, 24 Oct 2024 14:07:39 +0000 (UTC) Authentication-Results: imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G1JeHsCi; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=hostedemail.com; s=arc-20220608; t=1729778719; 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=st5wZ+4hhWdCNpLYWGNg0tZaBeLYIq7c3XYYCLrGuNqqy1xqHgCinwyVEBnxmmcBXikxk0 9w/nsvFIE/vbOnDDwqOKZnOwXvB5d1a1ije5xotIteQ9+DYjk2fQZqV1RyplOe+BDnWup4 bhCzuZ3JFrrAOgUw3rZqIuds+Ud5Z1A= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729778719; a=rsa-sha256; cv=none; b=Sf5GJrCNJx9dEHwwJRv8lDRuNfV53E+vG4/q2gojcMara4W8EncGjebqOcrB9Ky+x7feCK 8k0sPz+y/DAcDt+30ASgd8GNCvVr1f9bWL8t0jUkUmkXvG+KMYrZZh9aeF/h4aUHgOmpWI 4HqLhFFfK9bepzqVvEKSJN+m14H7YW8= ARC-Authentication-Results: i=1; imf09.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=G1JeHsCi; spf=pass (imf09.hostedemail.com: domain of dhowells@redhat.com designates 170.10.133.124 as permitted sender) smtp.mailfrom=dhowells@redhat.com; dmarc=pass (policy=none) header.from=redhat.com DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1729778872; 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=G1JeHsCi3WN75t4xpZDpxPFpbSjq5PPhd0jnAb/GzK3/MfpS2N1IMk1t7xWptfAFPD7+Ce 7MBhno+M1oo0U0qZkxquuH4woLWqjM2jJzbNMes6HAhznO/8ZM4SXYytoWpfaW14tRg7e6 QJmgeqJtPjrcgUPDq6iA3hF/2zBP6eA= Received: from mx-prod-mc-05.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-530-aBdfNAsnOIKNO2ip9a3iKg-1; Thu, 24 Oct 2024 10:07:46 -0400 X-MC-Unique: aBdfNAsnOIKNO2ip9a3iKg-1 Received: from mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com [10.30.177.12]) (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-05.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 53E881955F3B; Thu, 24 Oct 2024 14:07:42 +0000 (UTC) Received: from warthog.procyon.org.uk.com (unknown [10.42.28.231]) by mx-prod-int-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTP id C784219560A2; Thu, 24 Oct 2024 14:07:36 +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 14/27] afs: Fix directory format encoding struct Date: Thu, 24 Oct 2024 15:05:12 +0100 Message-ID: <20241024140539.3828093-15-dhowells@redhat.com> In-Reply-To: <20241024140539.3828093-1-dhowells@redhat.com> References: <20241024140539.3828093-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Rspam-User: X-Rspamd-Server: rspam04 X-Rspamd-Queue-Id: E83A9140026 X-Stat-Signature: rjsisyh575wo51nsz67gr335o1eo77fa X-HE-Tag: 1729778859-416640 X-HE-Meta: U2FsdGVkX19DEU4hgN+faj+ta6icccNj1MX9iMDQJ+lDl3fj9XYUxbTHPbpRVXAuL4o4LZ1y/sFmcyvbjV+uxFY6bKfoII7NxrqPFFILudj0JGeDlnQg9MStUh1EWRdYsGo1zUyzWMXRvOXxsMQe3vFNwnaRG2dwf8zMQ1emU9i5AN0Ckne2+xXhPfyEfjQskUpKEzMWyNVsfHu9Ug/Vkwt0s+DP88PvtV9teC3qmoBjpXK6u1P9aqkjnslEQdH8IhrgxyGD7V3DblwH9Hvzm/EMYmS0mvBUv2jB3AW7W7fGX5cEBYr8W6dZlmr80pbUz2zw4ZlXEv67hTZBGJbPBiRiDzFGw9+Pk93lYl7kdXusM1zIujP1m42DYFNN+6w1pRcZsRxMKXej+Szs/j/3QhU413xvTdm61iDiCtd9pizGTZcdEoPMX+AXSu4fr7y8E8vmyj0/qWSszJO5JWpK0EZvfzCjonmg4IF0Znp+sOUcmwgxlMu3RmRnBxs3TXwFn9CX9EXSmfu882Swb4WiYhRHbB2oyAYkANpaenBu0eNCs4K+ndMl0/G+K6zO1+V3801QjNdcpIZ49ulPEBhFV05tp3ng52HMzUzfEG8YMas5lTGEdOEesoxg/Kefqx8Xf9phIAHV9+IOrME0TXwvivl/ZIwIYJ6cABfYRon9fI0Oc9qIE7VcJlC46iT2xkztsnAra0fRs3VHhG3x4zGPxrXtw2wi2GGveNwsX1uTzTBM1hQBugWgNwYBBv2s35SEm7ZXi6GZIkHAsukM5QkIOMGpHTd+YrhlKOaYs9wkRxuIzVEiJR0SxPQSLEbd45aSStEsA99+Bgb3oZp/qP3KsKCnJm2aEO1alaYz5nBsspBcZrUB756tfHr/LcK1nNdXjT+sbUD6T1a4w7gMzRWxHFC9by1+OmkSE4jaMySvrJCbqVmaQf8l/JOnoCPAjSfSAs5LPR6jkz2Z/+rnrj/ EpM6CPeD EcwXec3bMG7udJBhXHkjxKsx2Kgjf+rQQLvoxj0mBGvGjBOVxJqz3xzfxVwEzwJK5zo4uYKQdSRKPEETwipFmRVOfTMczMPFQ3Pw8KSf7fUSrhjeXRZeelJxW3GNr9n5vduisyXQbn97dzWUXw3WTKvGCuduLOKu/OcP9B0NUE3tXa4AHG/lrpSgtDnb5vzh1pqXD0+3vqnjokyye60VtMIwK9D93Epvb1b+M0ay+m7HKyy6okjY6La6L9DJXRQfoKj/1h1r6EOBDbMKY7z0HSsRnh1B0/pw0MLH4Tkzmgd6GG6fwjWYal4ulaIw5gkDFT3i18lumrH9rJ7RTzbfs1hSxIvCgnGrVhx4uzMxa7emOgmDdMUeC8ENHXhwoSw05bo48sI0ecZgmGR3v09h74wt+YiR0RB+JyW4Hw/3h0NuPJpodyGvtuOdiZFyfobstkS4X 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;