Commit fa7d614d authored by David Howells's avatar David Howells
Browse files

afs: Don't use certain unnecessary folio_*() functions 



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: default avatarMatthew Wilcox <willy@infradead.org>
Signed-off-by: default avatarDavid Howells <dhowells@redhat.com>
cc: Marc Dionne <marc.dionne@auristor.com>
cc: linux-afs@lists.infradead.org
cc: linux-fsdevel@vger.kernel.org
parent 202bc57b

fs/afs/dir.c

+5 −5
Original line number Diff line number Diff line
@@ -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);