From patchwork Mon Jan 22 12:38:35 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: David Howells X-Patchwork-Id: 13525412 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 8C3C8C4725D for ; Mon, 22 Jan 2024 12:39:04 +0000 (UTC) Received: by kanga.kvack.org (Postfix) id 7CF236B0087; Mon, 22 Jan 2024 07:39:03 -0500 (EST) Received: by kanga.kvack.org (Postfix, from userid 40) id 75A8C6B0089; Mon, 22 Jan 2024 07:39:03 -0500 (EST) X-Delivered-To: int-list-linux-mm@kvack.org Received: by kanga.kvack.org (Postfix, from userid 63042) id 536286B008A; Mon, 22 Jan 2024 07:39:03 -0500 (EST) 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 3A33D6B0087 for ; Mon, 22 Jan 2024 07:39:03 -0500 (EST) Received: from smtpin13.hostedemail.com (a10.router.float.18 [10.200.18.1]) by unirelay06.hostedemail.com (Postfix) with ESMTP id 10E97A1D52 for ; Mon, 22 Jan 2024 12:39:03 +0000 (UTC) X-FDA: 81706901766.13.5783A38 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.124]) by imf08.hostedemail.com (Postfix) with ESMTP id 48427160016 for ; Mon, 22 Jan 2024 12:39:01 +0000 (UTC) Authentication-Results: imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Xby1Pxy0; spf=pass (imf08.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1705927141; 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=tRDq2jwLFhb5pXOHdUvfqCYrkV16pIgDVznzrFSoQl0=; b=GIeNNZK3s6VrCp0aFk7oOghJGsfmYhGeosiBTKYImYIavJr4eok9e03ZpXomi5rw5VlhQK 20QBM09wm/0xu4BW9OkrBWjvYwSi0qMOIHI8FnE5akedKdVfYy+ZId7a8ERDQUx/+sJ2z2 yjhe7fxIZXYYF1SpZFbYv0o0ZXzufts= ARC-Seal: i=1; s=arc-20220608; d=hostedemail.com; t=1705927141; a=rsa-sha256; cv=none; b=JzQzB7T2B2HOz5SYbWGiok0+bGqI323a3FU2w4caVF2mqiqzBTzBvNiEZn0iiBmJA+EpPo JlhGfqaOqGyZBoTxLqKb/LwXXXqDtrQNE6wBs2GGOgvBFKlSt9bqc0qneA3idty1i5sCJT PzkYrZsF1V8lxpymJdYtoo2Yemv646c= ARC-Authentication-Results: i=1; imf08.hostedemail.com; dkim=pass header.d=redhat.com header.s=mimecast20190719 header.b=Xby1Pxy0; spf=pass (imf08.hostedemail.com: domain of dhowells@redhat.com designates 170.10.129.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=1705927140; 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=tRDq2jwLFhb5pXOHdUvfqCYrkV16pIgDVznzrFSoQl0=; b=Xby1Pxy0ZS/j7+j6uo2ikZuw/ipHl2qwRAsS/ipAxXzYRCTDjLFH7WDDdQQMV1Y/dnAObb QGPvDc4DOmbjxQKui8HbNAg1mtg8jM/wpC8ygDLM995nm9Clkz1/TTE17YkLraAVuFQZWq BDWVoc9eXP8En+HSO5hKwwPhZ3fPoG8= Received: from mimecast-mx02.redhat.com (mimecast-mx02.redhat.com [66.187.233.88]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-357-UOC2OtDLMeOsQR0hPiJYIA-1; Mon, 22 Jan 2024 07:38:57 -0500 X-MC-Unique: UOC2OtDLMeOsQR0hPiJYIA-1 Received: from smtp.corp.redhat.com (int-mx06.intmail.prod.int.rdu2.redhat.com [10.11.54.6]) (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 mimecast-mx02.redhat.com (Postfix) with ESMTPS id 840ED83106D; Mon, 22 Jan 2024 12:38:56 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id A0F1C2166B31; Mon, 22 Jan 2024 12:38:54 +0000 (UTC) From: David Howells To: Christian Brauner Cc: David Howells , Jeff Layton , Matthew Wilcox , 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, linux-kernel@vger.kernel.org, Marc Dionne Subject: [PATCH 02/10] afs: Don't use certain internal folio_*() functions Date: Mon, 22 Jan 2024 12:38:35 +0000 Message-ID: <20240122123845.3822570-3-dhowells@redhat.com> In-Reply-To: <20240122123845.3822570-1-dhowells@redhat.com> References: <20240122123845.3822570-1-dhowells@redhat.com> MIME-Version: 1.0 X-Scanned-By: MIMEDefang 3.4.1 on 10.11.54.6 X-Rspamd-Queue-Id: 48427160016 X-Rspam-User: X-Stat-Signature: twj7sb88rzzz8ayj86qa3j8racmcbbmp X-Rspamd-Server: rspam03 X-HE-Tag: 1705927141-757675 X-HE-Meta: U2FsdGVkX199zdye8zhgQtIF/uaaluvK711e9qh5GBGnWnRAo4JAPHc/0xg26FDd7OCaGC9UeSNdWK86uWwkjRgoxZjPhLopR1pqsHhuIZnqsI8f4LgbYNWaZ5BTB5FNY0Dj+am4vzNYF0MhkQAprkQFGpV6FVlB8BOXPNfkbrIzFtHT0DXmQptGWWGFVyfpe3P7QvepjIIQTzat8uVStVkdbKMYkNZCyRDJhzU9iS0kGHhxUfFWl9ld0UMQbnNACuuwMsSaPgafbf0uo4uGr2z9624vFBOEzoYeggbsksqGxvketbAq86zoFU9bodLuuLeKlCxKYV3ihuJhhXFGXnWgNnoJwGIah7J+dnTDcJHLj0QLAgATxLettlyj2+VzdbPJ0yGc7dNrFB2Se1MqgC1BU5nxd/oZh26iI/6EnIEVHgBalKUFsYi7Lb8ScU0pSMcKcKN2LhtxCFXaeoIJL213A7TfrrcXdQH8cRtBe7tgpbDXGMDRE2p0a+XVoFEHhFUuiiS+gr86sfhagdFIPa1uyvRN5AW4poUrdOMU1+pAOQdRmjXWCwht9ThCFbpEfDvZ5/QYWFEb6fiZCZSZRiazG4BlZBKbqXU7rpQOd8h9r93NKowavjQORjSDhmxDdyOWIox3roEg1hHZGMkgVlchroU4LYEXqaGzrkD+nix+vj6zyoNatRegp+KadRlBqoD4vo/2Wd57kWutZGpTHDypC5TZD1FPaXM+nCoZBEZio6NK+2ByUcW9hjYkn0GPCwJeYGD0sGxJKhEkZVYSZBTgDnvZPZTF41cjBKPd7im4qDFdZQcOa6UK4G+eQC2ze3nvl/iBQSet9AX8yiTXdh7dghOcwV1/AELOuhsPtNZw5Prgu3T9TUcZ0trfL9kjrDVqhqMs2c2xCfW+K2F+Q3prFTuRXDcKamdmbY1Rxwz45IlKYWjElKvbf7frq3xLzHy2762CzpxGnP2TjHY QSpTyXqA ut23GkzskcnXuyp50UCn/rpAzTUe8l7Rs7SgracZLYPbw3kU5CRINUDwaSU0w2eW5QR7H2VV0jZoJKi6UqtbSIDRJ1RAWitiCx1r5ha3ouC3EA4sVdbfC/WWVhcMVcVOfEk7pCyB2WUBwo3ywA6oJzuLxNeUwlRV93VMq7PDnutZih8mOsQzxoj9reJII1YPpVo1vq9KUcdB3YPbXTeiVlAUtrkhRmRz+K/ntgmf7fqcZwr5CgvYUtBGX2He8UdRNRysYPSxb+KMAO0rWbb6IEd8wUF+GIGHSbFeV7c1rdzIaGQ9NWzGYH5eDqzCLBAyqljpsxxPwCtJ5qAb5tTi6FxTZtL1VyvDcHjoX8+alnJJBMoog+WB9uqaE8WNM/yEDHgVv6pSKrcUURws= 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: Filesystems should not be using folio->index not folio_index(folio) and folio->mapping, not folio_mapping() or folio_file_mapping() in filesystem code. Change this automagically with: perl -p -i -e 's/folio_mapping[(]([^)]*)[)]/\1->mapping/g' fs/afs/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/afs/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/afs/*.c Reported-by: Matthew Wilcox Signed-off-by: David Howells cc: Marc Dionne cc: linux-afs@lists.infradead.org cc: linux-fsdevel@vger.kernel.org --- fs/afs/dir.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/fs/afs/dir.c b/fs/afs/dir.c index c14533ef108f..3f73d61f7c8a 100644 --- a/fs/afs/dir.c +++ b/fs/afs/dir.c @@ -124,7 +124,7 @@ static void afs_dir_read_cleanup(struct afs_read *req) if (xas_retry(&xas, folio)) continue; BUG_ON(xa_is_value(folio)); - ASSERTCMP(folio_file_mapping(folio), ==, mapping); + ASSERTCMP(folio->mapping, ==, mapping); folio_put(folio); } @@ -202,12 +202,12 @@ static void afs_dir_dump(struct afs_vnode *dvnode, struct afs_read *req) if (xas_retry(&xas, folio)) continue; - BUG_ON(folio_file_mapping(folio) != mapping); + BUG_ON(folio->mapping != mapping); size = min_t(loff_t, folio_size(folio), req->actual_len - folio_pos(folio)); for (offset = 0; offset < size; offset += sizeof(*block)) { block = kmap_local_folio(folio, offset); - pr_warn("[%02lx] %32phN\n", folio_index(folio) + offset, block); + pr_warn("[%02lx] %32phN\n", folio->index + offset, block); kunmap_local(block); } } @@ -233,7 +233,7 @@ static int afs_dir_check(struct afs_vnode *dvnode, struct afs_read *req) if (xas_retry(&xas, folio)) continue; - BUG_ON(folio_file_mapping(folio) != mapping); + BUG_ON(folio->mapping != mapping); if (!afs_dir_check_folio(dvnode, folio, req->actual_len)) { afs_dir_dump(dvnode, req); @@ -2022,7 +2022,7 @@ static bool afs_dir_release_folio(struct folio *folio, gfp_t gfp_flags) { struct afs_vnode *dvnode = AFS_FS_I(folio_inode(folio)); - _enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio_index(folio)); + _enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio->index); folio_detach_private(folio);