linux-kernel - linux-next: manual merge of the mm-stable tree with the nfs-anna tree

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Date:   Thu, 16 Feb 2023 14:05:14 +1100
From:   Stephen Rothwell <sfr@...b.auug.org.au>
To:     Andrew Morton <akpm@...ux-foundation.org>,
        Anna Schumaker <anna@...nel.org>,
        Trond Myklebust <trondmy@...il.com>
Cc:     NFS Mailing List <linux-nfs@...r.kernel.org>,
        Anna Schumaker <Anna.Schumaker@...app.com>,
        Linux Kernel Mailing List <linux-kernel@...r.kernel.org>,
        Linux Next Mailing List <linux-next@...r.kernel.org>,
        "Matthew Wilcox (Oracle)" <willy@...radead.org>,
        Trond Myklebust <trond.myklebust@...merspace.com>
Subject: linux-next: manual merge of the mm-stable tree with the nfs-anna
 tree

Hi all,

Today's linux-next merge of the mm-stable tree got a conflict in:

  fs/nfs/write.c

between commit:

  0c493b5cf16e ("NFS: Convert buffered writes to use folios")

from the nfs-anna tree and commit:

  d585bdbeb79a ("fs: convert writepage_t callback to pass a folio")

from the mm-stable tree.

I fixed it up (see below) and can carry the fix as necessary. This
is now fixed as far as linux-next is concerned, but any non trivial
conflicts should be mentioned to your upstream maintainer when your tree
is submitted for merging.  You may also want to consider cooperating
with the maintainer of the conflicting tree to minimise any particularly
complex conflicts.

-- 
Cheers,
Stephen Rothwell

diff --cc fs/nfs/write.c
index b508c985eb14,9d6432cb3f44..f4cca8f00c0c
--- a/fs/nfs/write.c
+++ b/fs/nfs/write.c
@@@ -688,15 -689,14 +688,14 @@@ int nfs_writepage(struct page *page, st
  	return ret;
  }
  
- static int nfs_writepages_callback(struct page *page,
+ static int nfs_writepages_callback(struct folio *folio,
 -		struct writeback_control *wbc, void *data)
 +				   struct writeback_control *wbc, void *data)
  {
- 	struct folio *folio = page_folio(page);
  	int ret;
  
 -	ret = nfs_do_writepage(&folio->page, wbc, data);
 +	ret = nfs_do_writepage(folio, wbc, data);
  	if (ret != AOP_WRITEPAGE_ACTIVATE)
- 		unlock_page(page);
+ 		folio_unlock(folio);
  	return ret;
  }
  

Content of type "application/pgp-signature" skipped