linux-next: manual merge of the fscache tree with Linus' tree

linux-next: manual merge of the fscache tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 1597 bytes --]

Hi all,

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

  fs/afs/write.c

between commit:

  75b69799610c ("afs: Use wait_on_page_writeback_killable")

from Linus' tree and commit:

  721597fd1aa6 ("afs: Prepare for use of THPs")

from the fscache 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/afs/write.c
index eb737ed63afb,b2e03de09c24..000000000000
--- a/fs/afs/write.c
+++ b/fs/afs/write.c
@@@ -848,13 -845,16 +845,15 @@@ vm_fault_t afs_page_mkwrite(struct vm_f
  	 * be modified.  We then assume the entire page will need writing back.
  	 */
  #ifdef CONFIG_AFS_FSCACHE
- 	fscache_wait_on_page_write(vnode->cache, vmf->page);
+ 	if (PageFsCache(page) &&
+ 	    wait_on_page_bit_killable(page, PG_fscache) < 0)
+ 		return VM_FAULT_RETRY;
  #endif
  
- 	if (wait_on_page_writeback_killable(vmf->page))
 -	if (PageWriteback(page) &&
 -	    wait_on_page_bit_killable(page, PG_writeback) < 0)
++	if (wait_on_page_writeback_killable(page))
  		return VM_FAULT_RETRY;
  
- 	if (lock_page_killable(vmf->page) < 0)
+ 	if (lock_page_killable(page) < 0)
  		return VM_FAULT_RETRY;
  
  	/* We mustn't change page->private until writeback is complete as that

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the fscache tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 744 bytes --]

Hi all,

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

  Documentation/filesystems/netfs_library.rst

between commit:

  ddca5b0eba4e ("netfs: Adjust docs after foliation")

from Linus' tree and commit:

  b3c088faf78b ("fscache: Rewrite documentation")

from the fscache tree.

I fixed it up (I just used the latter version) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]

linux-next: manual merge of the fscache tree with Linus' tree

[Stephen Rothwell]

[-- Attachment #1: Type: text/plain, Size: 783 bytes --]

Hi all,

Today's linux-next merge of the fscache tree got conflicts in:

  fs/9p/cache.c
  fs/9p/vfs_addr.c

between commit:

  bc868036569e ("9p: Fix a bunch of kerneldoc warnings shown up by W=1")

from Linus' tree and commit:

  fcd4c99b70ce ("9p: Convert to using the netfs helper lib to do reads and caching")

from the fscache tree.

I fixed it up (I used the latter versions) 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

[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]