From patchwork Fri Oct 25 20:39:41 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13851567 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 2B48BD149F0 for ; Fri, 25 Oct 2024 20:42:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id A5A6F6B0083; Fri, 25 Oct 2024 16:42:03 -0400 (EDT) Received: by kanga.kvack.org (Postfix, from userid 40) id 9BC6A6B00AB; Fri, 25 Oct 2024 16:42:03 -0400 (EDT) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 7E6846B00AD; Fri, 25 Oct 2024 16:42:03 -0400 (EDT) X-Delivered-To: linux-mm@kvack.org Received: from relay.hostedemail.com (smtprelay0017.hostedemail.com [216.40.44.17]) by kanga.kvack.org (Postfix) with ESMTP id 5B8FD6B0083 for ; Fri, 25 Oct 2024 16:42:03 -0400 (EDT) Received: from smtpin08.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay03.hostedemail.com (Postfix) with ESMTP id EBB46A1107 for ; Fri, 25 Oct 2024 20:41:26 +0000 (UTC) X-FDA: 82713295602.08.4B73EA7 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.133.124]) by imf24.hostedemail.com (Postfix) with ESMTP id 5BD9218001B for ; Fri, 25 Oct 2024 20:41:58 +0000 (UTC) Authentication-Results: imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fz8mU1wq; spf=pass (imf24.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=1729888767; 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=WIxbYBAL1vZEousu0RZv4+ckvE0WMRjpGG3xsLZg8FAsZDwAl5pEk1ub4Dnd9U5k1zC0mE QUkz3DSAmPcGAdxtwZHsy6ea+DOYFWtS3/HpFkNCrKw7qnntrbw/XP5CBzQW1la0c654AA INgP5O2TbuAlkSV15xigJs/opVUzWcI= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1729888767; a=rsa-sha256; cv=none; b=WLTgF/KX/3QfRiv8Vfl8L7WHUUjNufGxQbHWaoyqVwufIAAwQr9Quv5eUTkE6zySSADP0P SSYFRedYnGDPEtGKkpuuiPlaHyZ5AWa66ZpU3ZEztCDaaMfd5gIjS8m01xMckXlaWQOZJ9 Ov1a8O//eJ9eHetpYyKDxs+eMlC1WXc= ARC-Authentication-Results: i=1; imf24.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=fz8mU1wq; spf=pass (imf24.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=1729888920; 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=fz8mU1wq3QeLpYt48ouIjIYe4df88E/hwAloSzcF7oSWSbDsLBDukwqLK/95ynDI4rVrAE 6hdgVpp46hvIEaOajUFwVHHk0PWTePJ+UHa7Pq2kCIZm72E9Mr7cBnYXIU0v4WPykZYb2X +VPIzTuWxlgeMRMot5WWRoBURwdvrus= Received: from mx-prod-mc-03.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-358-2-4fzlHMNnKbyI7I-IjOzQ-1; Fri, 25 Oct 2024 16:41:57 -0400 X-MC-Unique: 2-4fzlHMNnKbyI7I-IjOzQ-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-03.mail-002.prod.us-west-2.aws.redhat.com (Postfix) with ESMTPS id 4AF4E1955F3F; Fri, 25 Oct 2024 20:41:54 +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 65AA219560A2; Fri, 25 Oct 2024 20:41:49 +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 v2 14/31] afs: Fix directory format encoding struct Date: Fri, 25 Oct 2024 21:39:41 +0100 Message-ID: <20241025204008.4076565-15-dhowells@redhat.com> In-Reply-To: <20241025204008.4076565-1-dhowells@redhat.com> References: <20241025204008.4076565-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.0 on 10.30.177.12 X-Rspamd-Queue-Id: 5BD9218001B X-Stat-Signature: mpbpqy6jepob64urr17k4dxk46bmctsn X-Rspamd-Server: rspam09 X-Rspam-User: X-HE-Tag: 1729888918-843585 X-HE-Meta: U2FsdGVkX18U8bgqodOy4K3t4vIsh4SumNG6bg8oNiQCMj/zoThEx8dRf+NbcrjBb8WVZQPyoJnywV97shW0snbqPLDkeETW1GnVc5CarMvSsbeHVnDiXkKTcc4zScjyPQfg5GXjIlNSwDK5sDcXQLSEuLqH+rHbQLhKKU4ZitbIkG+TI1bhEDN9xzTFu3Ciz9R50OUdqTDOVFhx0C8naRLAEl7BLe5HiIBiFfSpNv5BSNqVg/wnMDZbhixmBs4yWi8yunY1k/kP15WdH52bpBsi4z8VBiB80UB9fKMrbIazN9sQ80M2SHslAwPIXHvdEtSeqmen7WDvvBhOqqhrLh1Ct9oOOuceGdd8HGhYL7YKxf9CDMaTJwtjt5bjkr33sRIqaiCXg94Gw4Qj4XNoyr2HIjXaH7s81Unx5jhRgdST3GfOe6LCSJwDK+D6wrUPFzkQzRLLrIsR1+c4p2BYnCw4ThI2pj3NDktg84XKkf7RDttC1I5Yzk2uieKbKlZ9WWit5dmHo2F7QFTKd3qdZcIVsv8Xnx2wxnz7+AXrjVfqR7NW/4QvUHdds9QdpeARGq6QFciz7OdvJ8+OJHN7G7g9xPGC+CSLrNqh8OJ9hGapkdP8uew7QPhYnnmmCjm/GufIBmmsvIPcQFVOyew+h6HXnNehhgnMGDRqEC+yTxjTYqTo5ldaSWniYOW8Brci5M5iJberDks3bfzZwA5qK7V1+tuMpIx+i/o08lJg2SEse4s8cewPbC65aMMlrNukbsjbFVmD/MWI24T/NMKLwBIC95gmR9OA3vxZwl2eJ8fktLHmWNk5S6yRmhRoHSDKYmrdHMA97sysX1eJy8KswcLkPRcTVjcAQ9NwsWMO3MBjNY8W4hihkut/kXwhVlzhuqMswaakWpy6AfatLLynWzttQV7hfkF9f09hefHoNkRo9+ptYud0LCJZmA8Al9COPVfRm9BZcj0HmDKj+/k pTDY/0Uu JEdDGKWDKzeAhjPUXHWo6ibJHvlPp2tGcM/H9FKnJuFvhidJqPtiXyRYpUU+jmpISp8vayDnviv3G7W/vA6w9mEuMblKbDnlYY6l8aDXFxDmwMRymc2vfw4z6ABKjeyf9kLOe74FeFyfvqQBIja/PJc9ysWJHAcV3Xg7pd6F/Ydu9NyjRD8PcsKh33q5/nuXH6XEqC9PhrzkdGeLKuIgeb6Mq2dQFb2GVeBSfPbiDis2xwrkss5eRVqklqrmYewbvTrX133jYb67GXgzVWYDTQi2BvM+o7Duk5f/AKXGulT2EJPxpfQ/RmW0MLGGegh1ViWEVmgL3kpjajNCyIeQpHy36iCz5jj5aw0wqq+dJmW+y4LtbbIgHHxPZDJ9Hrm4qd3S4unhQHq1IwH9ycOhBdxvSj7DMox4Gg/B7+aJXl6zFlHPcolY+lF6BA6DAckVXN0xj 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;