Skip to content

Commit c40497d

Browse files
committed
cifs: 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/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 <willy@infradead.org> Signed-off-by: David Howells <dhowells@redhat.com> cc: Jeff Layton <jlayton@kernel.org> cc: Steve French <sfrench@samba.org> cc: Paulo Alcantara <pc@manguebit.com> cc: Ronnie Sahlberg <lsahlber@redhat.com> cc: Shyam Prasad N <sprasad@microsoft.com> cc: Tom Talpey <tom@talpey.com> cc: linux-cifs@vger.kernel.org cc: linux-fsdevel@vger.kernel.org
1 parent fa7d614 commit c40497d

1 file changed

Lines changed: 5 additions & 5 deletions

File tree

fs/smb/client/file.c

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ void cifs_pages_written_back(struct inode *inode, loff_t start, unsigned int len
8787
continue;
8888
if (!folio_test_writeback(folio)) {
8989
WARN_ONCE(1, "bad %x @%llx page %lx %lx\n",
90-
len, start, folio_index(folio), end);
90+
len, start, folio->index, end);
9191
continue;
9292
}
9393

@@ -120,7 +120,7 @@ void cifs_pages_write_failed(struct inode *inode, loff_t start, unsigned int len
120120
continue;
121121
if (!folio_test_writeback(folio)) {
122122
WARN_ONCE(1, "bad %x @%llx page %lx %lx\n",
123-
len, start, folio_index(folio), end);
123+
len, start, folio->index, end);
124124
continue;
125125
}
126126

@@ -151,7 +151,7 @@ void cifs_pages_write_redirty(struct inode *inode, loff_t start, unsigned int le
151151
xas_for_each(&xas, folio, end) {
152152
if (!folio_test_writeback(folio)) {
153153
WARN_ONCE(1, "bad %x @%llx page %lx %lx\n",
154-
len, start, folio_index(folio), end);
154+
len, start, folio->index, end);
155155
continue;
156156
}
157157

@@ -2651,7 +2651,7 @@ static void cifs_extend_writeback(struct address_space *mapping,
26512651
continue;
26522652
if (xa_is_value(folio))
26532653
break;
2654-
if (folio_index(folio) != index)
2654+
if (folio->index != index)
26552655
break;
26562656
if (!folio_try_get_rcu(folio)) {
26572657
xas_reset(&xas);
@@ -2899,7 +2899,7 @@ static int cifs_writepages_region(struct address_space *mapping,
28992899
goto skip_write;
29002900
}
29012901

2902-
if (folio_mapping(folio) != mapping ||
2902+
if (folio->mapping != mapping ||
29032903
!folio_test_dirty(folio)) {
29042904
start += folio_size(folio);
29052905
folio_unlock(folio);

0 commit comments

Comments
 (0)