nfs: remove dead code for the old swap over NFS implementation
Subsystems (2)
PATCH 1/1 nfs: remove dead code for the old swap over NFS implementation
Remove the code testing folio_test_swapcache either explicitly or implicitly in pagemap.h headers, as is now handled using the direct I/O path and not the buffered I/O path that these helpers are located in.
--- fs/nfs/file.c | 6 +- fs/nfs/filelayout/filelayout.c | 1 - fs/nfs/fscache.c | 2 +- fs/nfs/internal.h | 8 +-- fs/nfs/pagelist.c | 2 +- fs/nfs/pnfs.h | 22 ------ fs/nfs/pnfs_nfs.c | 47 ------------ fs/nfs/read.c | 2 +- fs/nfs/write.c | 128 +++++++-------------------------- include/linux/nfs_page.h | 4 +- 10 files changed, 36 insertions(+), 186 deletions(-)
fs/nfs/file.c +3 -3
@@ -425,7 +425,7 @@ static int nfs_write_end(struct file *file, struct address_space *mapping,static void nfs_invalidate_folio (struct folio *folio,size_t offset,size_t length) { -struct inode *inode =folio_file_mapping (folio)->host; +struct inode *inode = folio->mapping->host;dfprintk (PAGECACHE ,"NFS: invalidate_folio(%lu, %zu, %zu)\n" , folio->index, offset, length);
@@ -452,7 +452,7 @@ static bool nfs_release_folio(struct folio *folio, gfp_t gfp)if ((current_gfp_context (gfp) &GFP_KERNEL ) !=GFP_KERNEL ||current_is_kswapd ())return false; -if (nfs_wb_folio (folio_file_mapping (folio)->host, folio) <0 ) +if (nfs_wb_folio (folio->mapping->host, folio) <0 )return false; }return nfs_fscache_release_folio (folio, gfp);
@@ -604,7 +604,7 @@ static vm_fault_t nfs_vm_page_mkwrite(struct vm_fault *vmf) TASK_KILLABLE|TASK_FREEZABLE_UNSAFE);folio_lock (folio); - mapping =folio_file_mapping (folio); + mapping = folio->mapping;if (mapping != inode->i_mapping) goto out_unlock;
fs/nfs/filelayout/filelayout.c +0 -1
@@ -1110,7 +1110,6 @@ static const struct pnfs_commit_ops filelayout_commit_ops = { .clear_request_commit = pnfs_generic_clear_request_commit, .scan_commit_lists = pnfs_generic_scan_commit_lists, .recover_commit_reqs = pnfs_generic_recover_commit_reqs, - .search_commit_reqs = pnfs_generic_search_commit_reqs, .commit_pagelist = filelayout_commit_pagelist, };
fs/nfs/fscache.c +1 -1
@@ -341,7 +341,7 @@ void nfs_netfs_initiate_read(struct nfs_pgio_header *hdr)int nfs_netfs_folio_unlock (struct folio *folio) { -struct inode *inode =folio_file_mapping (folio)->host; +struct inode *inode = folio->mapping->host;/* * If fscache is enabled, netfs will unlock pages.
fs/nfs/internal.h +4 -4
@@ -785,7 +785,7 @@ static inline void nfs_folio_mark_unstable(struct folio *folio, struct nfs_commit_info *cinfo) {if (folio && !cinfo->dreq) { -struct inode *inode =folio_file_mapping (folio)->host; +struct inode *inode = folio->mapping->host;long nr =folio_nr_pages (folio);/* This page is really still in write-back - just that the
@@ -803,7 +803,7 @@ static inline void nfs_folio_mark_unstable(struct folio *folio,static inline unsigned int nfs_page_length (struct page *page) { -loff_t i_size =i_size_read (page_file_mapping (page)->host); +loff_t i_size =i_size_read (page->mapping->host);if (i_size >0 ) {pgoff_t index =page_index (page);
@@ -821,10 +821,10 @@ unsigned int nfs_page_length(struct page *page)*/ static inline size_t nfs_folio_length (struct folio *folio) { -loff_t i_size =i_size_read (folio_file_mapping (folio)->host); +loff_t i_size =i_size_read (folio->mapping->host);if (i_size >0 ) { -pgoff_t index =folio_index (folio) >>folio_order (folio); +pgoff_t index = folio->index >>folio_order (folio);pgoff_t end_index = (i_size -1 ) >>folio_shift (folio);if (index < end_index)return folio_size (folio);
fs/nfs/pagelist.c +1 -1
@@ -569,7 +569,7 @@ struct nfs_page *nfs_page_create_from_folio(struct nfs_open_context *ctx,if (IS_ERR (l_ctx))return ERR_CAST (l_ctx); - ret =nfs_page_create (l_ctx, offset,folio_index (folio), offset, count); + ret =nfs_page_create (l_ctx, offset, folio->index, offset, count);if (!IS_ERR (ret)) {nfs_page_assign_folio (ret, folio);nfs_page_group_init (ret,NULL );
fs/nfs/pnfs.h +0 -22
@@ -193,8 +193,6 @@ struct pnfs_commit_ops { int max);void (*recover_commit_reqs) (struct list_head *list,struct nfs_commit_info *cinfo); -struct nfs_page * (*search_commit_reqs)(struct nfs_commit_info *cinfo, -struct folio *folio); };struct pnfs_layout_hdr {
@@ -396,8 +394,6 @@ void pnfs_generic_prepare_to_resend_writes(struct nfs_commit_data *data);void pnfs_generic_rw_release (void *data);void pnfs_generic_recover_commit_reqs (struct list_head *dst,struct nfs_commit_info *cinfo); -struct nfs_page *pnfs_generic_search_commit_reqs (struct nfs_commit_info *cinfo, -struct folio *folio); int pnfs_generic_commit_pagelist(struct inode *inode, struct list_head *mds_pages, int how,
@@ -557,17 +553,6 @@ pnfs_recover_commit_reqs(struct list_head *head, struct nfs_commit_info *cinfo) fl_cinfo->ops->recover_commit_reqs (head, cinfo); } -static inline struct nfs_page * -pnfs_search_commit_reqs (struct inode *inode,struct nfs_commit_info *cinfo, -struct folio *folio) -{ -struct pnfs_ds_commit_info *fl_cinfo = cinfo->ds; - -if (!fl_cinfo->ops || !fl_cinfo->ops->search_commit_reqs) -return NULL ; -return fl_cinfo->ops->search_commit_reqs (cinfo, folio); -} -/* Should the pNFS client commit and return the layout upon a setattr */ static inline bool pnfs_ld_layoutret_on_setattr (struct inode *inode)
@@ -864,13 +849,6 @@ pnfs_recover_commit_reqs(struct list_head *head, struct nfs_commit_info *cinfo) { } -static inline struct nfs_page * -pnfs_search_commit_reqs (struct inode *inode,struct nfs_commit_info *cinfo, -struct folio *folio) -{ -return NULL ; -} -static inline int pnfs_layoutcommit_inode (struct inode *inode,bool sync) {return 0 ;
fs/nfs/pnfs_nfs.c +0 -47
53 lines not on this page · raw message
fs/nfs/read.c +1 -1
@@ -288,7 +288,7 @@ int nfs_read_add_folio(struct nfs_pageio_descriptor *pgio,struct nfs_open_context *ctx, struct folio *folio) { - struct inode *inode = folio_file_mapping(folio)->host; + struct inode *inode = folio->mapping->host;struct nfs_server *server =NFS_SERVER (inode);size_t fsize =folio_size (folio);unsigned int rsize = server->rsize;
fs/nfs/write.c +24 -104
272 lines not on this page · raw message
include/linux/nfs_page.h +2 -2
@@ -208,8 +208,8 @@ static inline struct inode *nfs_page_to_inode(const struct nfs_page *req)struct folio *folio =nfs_page_to_folio (req);if (folio ==NULL ) -return page_file_mapping (req->wb_page)->host; -return folio_file_mapping (folio)->host; +return req->wb_page->mapping->host; +return folio->mapping->host; }/**
Signature · 1 line
2.43.0
Hi Christoph,
kernel test robot noticed the following build warnings:
https://git-scm.com/docs/git-format-patch#_base_tree_information]
url: https://github.com/intel-lab-lkp/linux/commits/Christoph-Hellwig/nfs-remove-dead-code-for-the-old-swap-over-NFS-implementation/20240615-161031 base: git://git.linux-nfs.org/projects/trondmy/linux-nfs.git linux-next patch link: https://lore.kernel.org/r/20240615080827.1239935-1-hch%40lst.de patch subject: [PATCH] nfs: remove dead code for the old swap over NFS implementation config: x86_64-randconfig-161-20240616 (https://download.01.org/0day-ci/archive/20240616/[email protected]/config) compiler: clang version 18.1.5 (https://github.com/llvm/llvm-project 617a15a9eac96088ae5e9134248d8236e34b91b1)
If you fix the issue in a separate patch/commit (i.e. not just a new version of the same patch/commit), kindly add following tags
| Reported-by: kernel test robot <[email protected]> | Reported-by: Dan Carpenter <[email protected]> | Closes: https://lore.kernel.org/r/[email protected]/
smatch warnings:fs/nfs/write.c:737 nfs_inode_remove_request() warn: variable dereferenced before check 'folio' (see line 734)
vim +/folio +737 fs/nfs/write.c
^1da177e4c3f41 Linus Torvalds 2005-04-16 728 static void nfs_inode_remove_request(struct nfs_page *req)
^1da177e4c3f41 Linus Torvalds 2005-04-16 729 {
6a6d4644ce935d Scott Mayhew 2023-10-11 730 struct nfs_inode *nfsi = NFS_I(nfs_page_to_inode(req));
6a6d4644ce935d Scott Mayhew 2023-10-11 731
20633f042fd090 Weston Andros Adamson 2014-05-15 732 if (nfs_page_group_sync_on_bit(req, PG_REMOVE)) {
0c493b5cf16e28 Trond Myklebust 2023-01-19 733 struct folio *folio = nfs_page_to_folio(req->wb_head);
a43a94f57a0e00 Christoph Hellwig 2024-06-15 @734 struct address_space *mapping = folio->mapping;
^^^^^^^^^^^^^^Dereference
^1da177e4c3f41 Linus Torvalds 2005-04-16 735
600f111ef51dc2 Matthew Wilcox (Oracle 2023-11-17 736) spin_lock(&mapping->i_private_lock);
a43a94f57a0e00 Christoph Hellwig 2024-06-15 @737 if (likely(folio)) {
^^^^^Checked too late
0c493b5cf16e28 Trond Myklebust 2023-01-19 738 folio->private = NULL;
0c493b5cf16e28 Trond Myklebust 2023-01-19 739 folio_clear_private(folio);
0c493b5cf16e28 Trond Myklebust 2023-01-19 740 clear_bit(PG_MAPPED, &req->wb_head->wb_flags);
29418aa4bd487c Mel Gorman 2012-07-31 741 }
600f111ef51dc2 Matthew Wilcox (Oracle 2023-11-17 742) spin_unlock(&mapping->i_private_lock);
20633f042fd090 Weston Andros Adamson 2014-05-15 743 }
17089a29a25a3b Weston Andros Adamson 2014-07-11 744
33ea5aaa87cdae ZhangXiaoxu 2019-09-26 745 if (test_and_clear_bit(PG_INODE_REF, &req->wb_flags)) {
6a6d4644ce935d Scott Mayhew 2023-10-11 746 atomic_long_dec(&nfsi->nrequests);
dd1b2026323a2d Jeff Layton 2023-09-19 747 nfs_release_request(req);
33ea5aaa87cdae ZhangXiaoxu 2019-09-26 748 }
^1da177e4c3f41 Linus Torvalds 2005-04-16 749 }Signature · 2 lines
0-DAY CI Kernel Test Service https://github.com/intel/lkp-tests/wiki
Quoted 3 lines · Dan Carpenter
Hi Christoph,
kernel test robot noticed the following build warnings:
Seems like this is a pre-existing condition. But it is indeed a bit silly. In fact the whole nfs_page_to_folio thing is a bit weird, pages always are folios as well, so storing a union of a page and folio in nfs_page doesn't make a whole lot of sense. I'll look into cleaning this up in a follow on patch.