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/smb/client/*.c
perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' 
fs/smb/client/*.c
perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/smb/client/*.c

Reported-by: Matthew Wilcox <wi...@infradead.org>
Signed-off-by: David Howells <dhowe...@redhat.com>
cc: Jeff Layton <jlay...@kernel.org>
cc: Steve French <sfre...@samba.org>
cc: Paulo Alcantara <p...@manguebit.com>
cc: Ronnie Sahlberg <lsahl...@redhat.com>
cc: Shyam Prasad N <spra...@microsoft.com>
cc: Tom Talpey <t...@talpey.com>
cc: linux-c...@vger.kernel.org
cc: linux-fsde...@vger.kernel.org
---
 fs/smb/client/file.c | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/fs/smb/client/file.c b/fs/smb/client/file.c
index 3a213432775b..90da81d0372a 100644
--- a/fs/smb/client/file.c
+++ b/fs/smb/client/file.c
@@ -87,7 +87,7 @@ void cifs_pages_written_back(struct inode *inode, loff_t 
start, unsigned int len
                        continue;
                if (!folio_test_writeback(folio)) {
                        WARN_ONCE(1, "bad %x @%llx page %lx %lx\n",
-                                 len, start, folio_index(folio), end);
+                                 len, start, folio->index, end);
                        continue;
                }
 
@@ -120,7 +120,7 @@ void cifs_pages_write_failed(struct inode *inode, loff_t 
start, unsigned int len
                        continue;
                if (!folio_test_writeback(folio)) {
                        WARN_ONCE(1, "bad %x @%llx page %lx %lx\n",
-                                 len, start, folio_index(folio), end);
+                                 len, start, folio->index, end);
                        continue;
                }
 
@@ -151,7 +151,7 @@ void cifs_pages_write_redirty(struct inode *inode, loff_t 
start, unsigned int le
        xas_for_each(&xas, folio, end) {
                if (!folio_test_writeback(folio)) {
                        WARN_ONCE(1, "bad %x @%llx page %lx %lx\n",
-                                 len, start, folio_index(folio), end);
+                                 len, start, folio->index, end);
                        continue;
                }
 
@@ -2651,7 +2651,7 @@ static void cifs_extend_writeback(struct address_space 
*mapping,
                                continue;
                        if (xa_is_value(folio))
                                break;
-                       if (folio_index(folio) != index)
+                       if (folio->index != index)
                                break;
                        if (!folio_try_get_rcu(folio)) {
                                xas_reset(&xas);
@@ -2899,7 +2899,7 @@ static int cifs_writepages_region(struct address_space 
*mapping,
                                        goto skip_write;
                        }
 
-                       if (folio_mapping(folio) != mapping ||
+                       if (folio->mapping != mapping ||
                            !folio_test_dirty(folio)) {
                                start += folio_size(folio);
                                folio_unlock(folio);

Reply via email to