netfs, afs, erofs, cifs: Don't use certain internal folio_*() functions
Subsystems (12)
David Howells
maintainercover netfs, afs, erofs, cifs: Don't use certain internal folio_*() functions
Hi Christian, Willy,
Here are some patches that replace the use of folio_index(), folio_mapping() and folio_file_mapping() in some filesystem code. I'll add them to my netfs-lib branch.
David
David Howells (4):
netfs: Don't use certain internal folio_*() functions
afs: Don't use certain internal folio_*() functions
erofs: Don't use certain internal folio_*() functions
cifs: Don't use certain internal folio_*() functions
fs/afs/dir.c | 10 +++++----- fs/erofs/fscache.c | 6 +++--- fs/netfs/buffered_read.c | 12 ++++++------ fs/netfs/buffered_write.c | 10 +++++----- fs/netfs/io.c | 2 +- fs/netfs/misc.c | 2 +- fs/smb/client/file.c | 10 +++++----- 7 files changed, 26 insertions(+), 26 deletions(-)
David Howells
maintainerPATCH 1/4 netfs: Don't use certain internal folio_*() functions
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/netfs/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/netfs/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/netfs/*.c
--- fs/netfs/buffered_read.c | 12 ++++++------ fs/netfs/buffered_write.c | 10 +++++----- fs/netfs/io.c | 2 +- fs/netfs/misc.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-)
fs/netfs/buffered_read.c +6 -6
@@ -101,7 +101,7 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) }if (!test_bit (NETFS_RREQ_DONT_UNLOCK_FOLIOS , &rreq->flags)) { -if (folio_index (folio) == rreq->no_unlock_folio && +if (folio->index == rreq->no_unlock_folio &&test_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags))_debug ("no unlock" );else
@@ -246,13 +246,13 @@ EXPORT_SYMBOL(netfs_readahead);*/ int netfs_read_folio (struct file *file,struct folio *folio) { -struct address_space *mapping =folio_file_mapping (folio); +struct address_space *mapping = folio->mapping;struct netfs_io_request *rreq;struct netfs_inode *ctx =netfs_inode (mapping->host);struct folio *sink =NULL ;int ret; -_enter ("%lx" ,folio_index (folio)); +_enter ("%lx" , folio->index); rreq = netfs_alloc_request(mapping, file, folio_file_pos(folio), folio_size(folio),
@@ -460,7 +460,7 @@ int netfs_write_begin(struct netfs_inode *ctx, ret =PTR_ERR (rreq); goto error; } - rreq->no_unlock_folio =folio_index (folio); + rreq->no_unlock_folio = folio->index;__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); ret =netfs_begin_cache_read (rreq, ctx);
@@ -518,7 +518,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, size_t offset, size_t len) {struct netfs_io_request *rreq; -struct address_space *mapping =folio_file_mapping (folio); +struct address_space *mapping = folio->mapping;struct netfs_inode *ctx =netfs_inode (mapping->host);unsigned long long start =folio_pos (folio);size_t flen =folio_size (folio);
@@ -535,7 +535,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, goto error; } - rreq->no_unlock_folio =folio_index (folio); + rreq->no_unlock_folio = folio->index;__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); ret =netfs_begin_cache_read (rreq, ctx);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS )
fs/netfs/buffered_write.c +5 -5
@@ -343,7 +343,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,break ;default :WARN (true,"Unexpected modify type %u ix=%lx\n" , - howto,folio_index (folio)); + howto, folio->index); ret = -EIO ; goto error_folio_unlock; }
@@ -648,7 +648,7 @@ static void netfs_pages_written_back(struct netfs_io_request *wreq)xas_for_each (&xas, folio, last) {WARN (!folio_test_writeback (folio),"bad %zx @%llx page %lx %lx\n" , - wreq->len, wreq->start,folio_index (folio), last); + wreq->len, wreq->start, folio->index, last);if ((finfo =netfs_folio_info (folio))) {/* Streaming writes cannot be redirtied whilst under
@@ -795,7 +795,7 @@ static void netfs_extend_writeback(struct address_space *mapping,continue ;if (xa_is_value (folio))break ; -if (folio_index (folio) != index) { +if (folio->index != index) {xas_reset (xas);break ; }
@@ -901,7 +901,7 @@ static ssize_t netfs_write_back_from_locked_folio(struct address_space *mapping,long count = wbc->nr_to_write;int ret; -_enter (",%lx,%llx-%llx,%u" ,folio_index (folio), start, end, caching); +_enter (",%lx,%llx-%llx,%u" , folio->index, start, end, caching); wreq =netfs_alloc_request (mapping,NULL , start,folio_size (folio),NETFS_WRITEBACK );
@@ -1047,7 +1047,7 @@ static ssize_t netfs_writepages_begin(struct address_space *mapping, start =folio_pos (folio);/* May regress with THPs */ -_debug ("wback %lx" ,folio_index (folio)); +_debug ("wback %lx" , folio->index);/* At this point we hold neither the i_pages lock nor the page lock: * the page may be truncated or invalidated (changing page->mapping to
fs/netfs/io.c +1 -1
@@ -124,7 +124,7 @@ static void netfs_rreq_unmark_after_write(struct netfs_io_request *rreq,/* We might have multiple writes from the same huge * folio, but we mustn't unlock a folio more than once. */ -if (have_unlocked &&folio_index (folio) <= unlocked) +if (have_unlocked && folio->index <= unlocked)continue ; unlocked =folio_next_index (folio) -1 ;trace_netfs_folio (folio, netfs_folio_trace_end_copy);
fs/netfs/misc.c +1 -1
@@ -180,7 +180,7 @@ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length)struct netfs_folio *finfo =NULL ;size_t flen =folio_size (folio); -_enter ("{%lx},%zx,%zx" ,folio_index (folio), offset, length); +_enter ("{%lx},%zx,%zx" , folio->index, offset, length);folio_wait_fscache (folio);
Re: [PATCH 1/4] netfs: Don't use certain internal folio_*() functions
Quoted 4 lines · David Howells
Filesystems should not be using
folio->indexnotfolio_index(folio)andfolio->mapping, notfolio_mapping()orfolio_file_mapping()in filesystem code.
nit: Awkwardly worded sentence above. The first part sounds wrong too:
"Filesystems should not be using folio->index not folio_index(folio)"
I'm guessing you mean:
"Filesystems should be using folio->index, not folio_index(folio) since they know that it's in the pagecache."
Quoted 5 lines
Change this automagically with:
perl -p -i -e 's/folio_mapping[(]([^)]*)[)]/\1->mapping/g'
fs/netfs/*.cperl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g'fs/netfs/*.cperl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g'fs/netfs/*.c
FWIW, coccinelle is really much nicer for this sort of thing.
Quoted 139 lines
Reported-by Matthew Wilcox <[email protected]>Signed-off-by David Howells <[email protected]>cc Jeff Layton <[email protected]>--- fs/netfs/buffered_read.c | 12 ++++++------ fs/netfs/buffered_write.c | 10 +++++----- fs/netfs/io.c | 2 +- fs/netfs/misc.c | 2 +- 4 files changed, 13 insertions(+), 13 deletions(-)fs/netfs/buffered_read.c +6
-6@@ -101,7 +101,7 @@ void netfs_rreq_unlock_folios(struct netfs_io_request *rreq) }if (!test_bit (NETFS_RREQ_DONT_UNLOCK_FOLIOS , &rreq->flags)) { -if (folio_index (folio) == rreq->no_unlock_folio && +if (folio->index == rreq->no_unlock_folio &&test_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags))_debug ("no unlock" );else @@ -246,13 +246,13 @@ EXPORT_SYMBOL(netfs_readahead);*/ int netfs_read_folio (struct file *file,struct folio *folio) { -struct address_space *mapping =folio_file_mapping (folio); +struct address_space *mapping = folio->mapping;struct netfs_io_request *rreq;struct netfs_inode *ctx =netfs_inode (mapping->host);struct folio *sink =NULL ;int ret; -_enter ("%lx" ,folio_index (folio)); +_enter ("%lx" , folio->index); rreq = netfs_alloc_request(mapping, file, folio_file_pos(folio), folio_size(folio),@@ -460,7 +460,7 @@ int netfs_write_begin(struct netfs_inode *ctx, ret =PTR_ERR (rreq); goto error; } - rreq->no_unlock_folio =folio_index (folio); + rreq->no_unlock_folio = folio->index;__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); ret =netfs_begin_cache_read (rreq, ctx);@@ -518,7 +518,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, size_t offset, size_t len) {struct netfs_io_request *rreq; -struct address_space *mapping =folio_file_mapping (folio); +struct address_space *mapping = folio->mapping;struct netfs_inode *ctx =netfs_inode (mapping->host);unsigned long long start =folio_pos (folio);size_t flen =folio_size (folio);@@ -535,7 +535,7 @@ int netfs_prefetch_for_write(struct file *file, struct folio *folio, goto error; } - rreq->no_unlock_folio =folio_index (folio); + rreq->no_unlock_folio = folio->index;__set_bit (NETFS_RREQ_NO_UNLOCK_FOLIO , &rreq->flags); ret =netfs_begin_cache_read (rreq, ctx);if (ret == -ENOMEM || ret == -EINTR || ret == -ERESTARTSYS )fs/netfs/buffered_write.c +5
-5@@ -343,7 +343,7 @@ ssize_t netfs_perform_write(struct kiocb *iocb, struct iov_iter *iter,break ;default :WARN (true,"Unexpected modify type %u ix=%lx\n" , - howto,folio_index (folio)); + howto, folio->index); ret = -EIO ; goto error_folio_unlock; }@@ -648,7 +648,7 @@ static void netfs_pages_written_back(struct netfs_io_request *wreq)xas_for_each (&xas, folio, last) {WARN (!folio_test_writeback (folio),"bad %zx @%llx page %lx %lx\n" , - wreq->len, wreq->start,folio_index (folio), last); + wreq->len, wreq->start, folio->index, last);if ((finfo =netfs_folio_info (folio))) {/* Streaming writes cannot be redirtied whilst under @@ -795,7 +795,7 @@ static void netfs_extend_writeback(struct address_space *mapping,continue ;if (xa_is_value (folio))break ; -if (folio_index (folio) != index) { +if (folio->index != index) {xas_reset (xas);break ; }@@ -901,7 +901,7 @@ static ssize_t netfs_write_back_from_locked_folio(struct address_space *mapping,long count = wbc->nr_to_write;int ret; -_enter (",%lx,%llx-%llx,%u" ,folio_index (folio), start, end, caching); +_enter (",%lx,%llx-%llx,%u" , folio->index, start, end, caching); wreq =netfs_alloc_request (mapping,NULL , start,folio_size (folio),NETFS_WRITEBACK );@@ -1047,7 +1047,7 @@ static ssize_t netfs_writepages_begin(struct address_space *mapping, start =folio_pos (folio);/* May regress with THPs */ -_debug ("wback %lx" ,folio_index (folio)); +_debug ("wback %lx" , folio->index);/* At this point we hold neither the i_pages lock nor the page lock: * the page may be truncated or invalidated (changing page->mapping to fs/netfs/io.c +1
-1@@ -124,7 +124,7 @@ static void netfs_rreq_unmark_after_write(struct netfs_io_request *rreq,/* We might have multiple writes from the same huge * folio, but we mustn't unlock a folio more than once. */ -if (have_unlocked &&folio_index (folio) <= unlocked) +if (have_unlocked && folio->index <= unlocked)continue ; unlocked =folio_next_index (folio) -1 ;trace_netfs_folio (folio, netfs_folio_trace_end_copy);fs/netfs/misc.c +0
-0
fs/netfs/misc.c void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length) · line 186
Quoted 8 lines
fs/netfs/misc.c +1
-1@@ -180,7 +180,7 @@ void netfs_invalidate_folio(struct folio *folio, size_t offset, size_t length)struct netfs_folio *finfo =NULL ;size_t flen =folio_size (folio); -_enter ("{%lx},%zx,%zx" ,folio_index (folio), offset, length); +_enter ("{%lx},%zx,%zx" , folio->index, offset, length);folio_wait_fscache (folio);
Patch seems fine otherwise:
Re: [PATCH 1/4] netfs: Don't use certain internal folio_*() functions
In reply to David HowellsQuoted 3 lines
Quoted 1 line
Quoted 1 line
Quoted 1 line
Quoted 1 line
"David" == David Howells <[email protected]> writes:
Filesystems should not be using
folio->indexnotfolio_index(folio)
^^^
I think you have an extra 'not' in all four patch comments.
Quoted 2 lines
and folio-> mapping, not
folio_mapping()orfolio_file_mapping()in filesystem code.
David Howells
maintainerPATCH 2/4 afs: Don't use certain internal folio_*() functions
In reply to David HowellsFilesystems 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
--- fs/afs/dir.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/afs/dir.c +5 -5
@@ -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);
@@ -2014,7 +2014,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);
David Howells
maintainerPATCH 3/4 erofs: Don't use certain internal folio_*() functions
In reply to David HowellsFilesystems 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/erofs/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/erofs/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/erofs/*.c
--- fs/erofs/fscache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/erofs/fscache.c +3 -3
@@ -165,10 +165,10 @@ static int erofs_fscache_read_folios_async(struct fscache_cookie *cookie,static int erofs_fscache_meta_read_folio (struct file *data,struct folio *folio) {int ret; -struct erofs_fscache *ctx =folio_mapping (folio)->host->i_private; +struct erofs_fscache *ctx = folio->mapping->host->i_private;struct erofs_fscache_request *req; - req =erofs_fscache_req_alloc (folio_mapping (folio), + req =erofs_fscache_req_alloc (folio->mapping,folio_pos (folio),folio_size (folio));if (IS_ERR (req)) {folio_unlock (folio);
@@ -276,7 +276,7 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)struct erofs_fscache_request *req;int ret; - req =erofs_fscache_req_alloc (folio_mapping (folio), + req =erofs_fscache_req_alloc (folio->mapping,folio_pos (folio),folio_size (folio));if (IS_ERR (req)) {folio_unlock (folio);
Re: [PATCH 3/4] erofs: Don't use certain internal folio_*() functions
Quoted 10 lines · David Howells
Filesystems should not be using
folio->indexnotfolio_index(folio)andfolio->mapping, notfolio_mapping()orfolio_file_mapping()in filesystem code.Change this automagically with:
perl -p -i -e 's/folio_mapping[(]([^)]*)[)]/\1->mapping/g'
fs/erofs/*.cperl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g'fs/erofs/*.cperl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g'fs/erofs/*.c
Quoted 8 lines
Reported-by Matthew Wilcox <[email protected]>Signed-off-by David Howells <[email protected]>cc Gao Xiang <[email protected]>cc Chao Yu <[email protected]>cc Yue Hu <[email protected]>cc Jeffle Xu <[email protected]>
Thank you, David!
(I've asked Jingbo to find some free slot to refine
this part for later compressed data adaption. Yet that is another separate story. The patch looks good to me.)
Thanks,
Gao Xiang
Quoted 31 lines
--- fs/erofs/fscache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)fs/erofs/fscache.c +3
-3@@ -165,10 +165,10 @@ static int erofs_fscache_read_folios_async(struct fscache_cookie *cookie,static int erofs_fscache_meta_read_folio (struct file *data,struct folio *folio) {int ret; -struct erofs_fscache *ctx =folio_mapping (folio)->host->i_private; +struct erofs_fscache *ctx = folio->mapping->host->i_private;struct erofs_fscache_request *req; - req =erofs_fscache_req_alloc (folio_mapping (folio), + req =erofs_fscache_req_alloc (folio->mapping,folio_pos (folio),folio_size (folio));if (IS_ERR (req)) {folio_unlock (folio);@@ -276,7 +276,7 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)struct erofs_fscache_request *req;int ret; - req =erofs_fscache_req_alloc (folio_mapping (folio), + req =erofs_fscache_req_alloc (folio->mapping,folio_pos (folio),folio_size (folio));if (IS_ERR (req)) {folio_unlock (folio);
PATCH v2 3/4 erofs: Don't use certain internal folio_*() functions
In reply to David HowellsFrom: David Howells <[email protected]>
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/erofs/*.c perl -p -i -e 's/folio_file_mapping[(]([^)]*)[)]/\1->mapping/g' fs/erofs/*.c perl -p -i -e 's/folio_index[(]([^)]*)[)]/\1->index/g' fs/erofs/*.c
---
Hi folks,
I tend to apply this patch upstream since compressed data fscache adaption touches this part too. If there is no objection, I'm going to take this patch separately for -next shortly..
Thanks,
Gao Xiang
Change since v1:
- a better commit message pointed out by Jeff Layton.
fs/erofs/fscache.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
fs/erofs/fscache.c +3 -3
@@ -165,10 +165,10 @@ static int erofs_fscache_read_folios_async(struct fscache_cookie *cookie,static int erofs_fscache_meta_read_folio (struct file *data,struct folio *folio) {int ret; -struct erofs_fscache *ctx =folio_mapping (folio)->host->i_private; +struct erofs_fscache *ctx = folio->mapping->host->i_private;struct erofs_fscache_request *req; - req =erofs_fscache_req_alloc (folio_mapping (folio), + req =erofs_fscache_req_alloc (folio->mapping,folio_pos (folio),folio_size (folio));if (IS_ERR (req)) {folio_unlock (folio);
@@ -276,7 +276,7 @@ static int erofs_fscache_read_folio(struct file *file, struct folio *folio)struct erofs_fscache_request *req;int ret; - req =erofs_fscache_req_alloc (folio_mapping (folio), + req =erofs_fscache_req_alloc (folio->mapping,folio_pos (folio),folio_size (folio));if (IS_ERR (req)) {folio_unlock (folio);
Signature · 1 line
2.39.3
David Howells
maintainerPATCH 4/4 cifs: Don't use certain internal folio_*() functions
In reply to David HowellsFilesystems 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
--- fs/smb/client/file.c | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-)
fs/smb/client/file.c +5 -5
@@ -87,7 +87,7 @@ void cifs_pages_written_back(struct inode *inode, loff_t start, unsigned int lencontinue ;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 lencontinue ;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 lexas_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 ; }
@@ -2649,7 +2649,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);
Quoted 14 lines · David Howells
Hi Christian, Willy,
Here are some patches that replace the use of
folio_index(),folio_mapping()andfolio_file_mapping()in some filesystem code. I'll add them to my netfs-lib branch.David
David Howells (4):
netfs: Don't use certain internal folio_*() functions
afs: Don't use certain internal folio_*() functions
erofs: Don't use certain internal folio_*() functions
cifs: Don't use certain internal folio_*() functions
Quoted 9 lines
fs/afs/dir.c | 10 +++++----- fs/erofs/fscache.c | 6 +++--- fs/netfs/buffered_read.c | 12 ++++++------ fs/netfs/buffered_write.c | 10 +++++----- fs/netfs/io.c | 2 +- fs/netfs/misc.c | 2 +- fs/smb/client/file.c | 10 +++++----- 7 files changed, 26 insertions(+), 26 deletions(-)
Looks like a fairly straightforward cleanup. Aside from the changelog comments on patch #1: