From nobody Wed Oct 1 20:30:08 2025 Received: from us-smtp-delivery-124.mimecast.com (us-smtp-delivery-124.mimecast.com [170.10.129.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 370E41F616 for ; Mon, 22 Jan 2024 22:32:43 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=170.10.129.124 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705962765; cv=none; b=gw1Sqyr548Fi2aTCHOFnFFb5Dsqkq0fs1BoZ7xeVxrh5Un4UCfwj9ovVmgasB1/A+Zn/EUxgwBTqCNbPM5YzIl+Y/0GHtZMPbYj/YEc3UvHtTQZa9fof69QGkuH+iXXbcI+Nf8mblUiM7yt52VY48QuLuRn7WQPlOYhfPo/E3XU= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1705962765; c=relaxed/simple; bh=/cvksSSZmxrtzmRzMtQyJ29qGFgkxxbGXyOn+BgtGh0=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=n4Vw05a1Mkf6X4dg6wBBd6NUJYEtcBoVR1NKSgZAXFS/kgOUE0s2Dw8E6Bb3ASmyC5PouHhTIlWimMeRNnUKn1MdUFBIEk5khnapVaOaUr4KoB5U0P6OurOb7l6/971HZnBxLhJOdsJXVBWqzfvy6mATL3YJl5u1QnABGbpUSdM= 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=WgjUolro; arc=none smtp.client-ip=170.10.129.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="WgjUolro" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=redhat.com; s=mimecast20190719; t=1705962763; 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=x1zKGT6uFapv0Zv34dL5cckA4sfK0obP1h5qgfcrNJU=; b=WgjUolroANPaWrhY2u2oLTzfvCiZQVcS3rXLE/slNPsExxa4jvI3YbF2DjRXBvj86D75Ay PyhQPEHhR578McPF459iXcYsf+UgBFtbL/pyiKL8i2bhpmRPwGqonFuSFFlSq2tZxgB5Tu ysEsuGMNgFA3nB83hT7MyMA6cseCFc8= Received: from mimecast-mx02.redhat.com (mx-ext.redhat.com [66.187.233.73]) by relay.mimecast.com with ESMTP with STARTTLS (version=TLSv1.3, cipher=TLS_AES_256_GCM_SHA384) id us-mta-677-D55WZ7cLO0uVwnEeCzBXJA-1; Mon, 22 Jan 2024 17:32:39 -0500 X-MC-Unique: D55WZ7cLO0uVwnEeCzBXJA-1 Received: from smtp.corp.redhat.com (int-mx04.intmail.prod.int.rdu2.redhat.com [10.11.54.4]) (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 233F61C04181; Mon, 22 Jan 2024 22:32:39 +0000 (UTC) Received: from warthog.procyon.org.com (unknown [10.42.28.67]) by smtp.corp.redhat.com (Postfix) with ESMTP id 4C0FC2026D66; Mon, 22 Jan 2024 22:32:37 +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 v2 02/10] afs: Don't use certain unnecessary folio_*() functions Date: Mon, 22 Jan 2024 22:32:15 +0000 Message-ID: <20240122223230.4000595-3-dhowells@redhat.com> In-Reply-To: <20240122223230.4000595-1-dhowells@redhat.com> References: <20240122223230.4000595-1-dhowells@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.11.54.4 Content-Type: text/plain; charset="utf-8" Filesystems should use folio->index and folio->mapping, instead of folio_index(folio), folio_mapping() and folio_file_mapping() since they know that it's in the pagecache. 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), =3D=3D, mapping); + ASSERTCMP(folio->mapping, =3D=3D, mapping); =20 folio_put(folio); } @@ -202,12 +202,12 @@ static void afs_dir_dump(struct afs_vnode *dvnode, st= ruct afs_read *req) if (xas_retry(&xas, folio)) continue; =20 - BUG_ON(folio_file_mapping(folio) !=3D mapping); + BUG_ON(folio->mapping !=3D mapping); =20 size =3D min_t(loff_t, folio_size(folio), req->actual_len - folio_pos(fo= lio)); for (offset =3D 0; offset < size; offset +=3D sizeof(*block)) { block =3D 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, stru= ct afs_read *req) if (xas_retry(&xas, folio)) continue; =20 - BUG_ON(folio_file_mapping(folio) !=3D mapping); + BUG_ON(folio->mapping !=3D mapping); =20 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 =3D AFS_FS_I(folio_inode(folio)); =20 - _enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio_in= dex(folio)); + _enter("{{%llx:%llu}[%lu]}", dvnode->fid.vid, dvnode->fid.vnode, folio->i= ndex); =20 folio_detach_private(folio);