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

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

[Stephen Rothwell]

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

Hi all,

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

  fs/nfs/nfs4proc.c

between commit:

  21e31401fc45 ("NFS: Disable READ_PLUS by default")

from Linus' tree and commit:

  5c3485bb12c9 ("NFSv4.2/pnfs: Don't use READ_PLUS with pNFS yet")

from the nfs 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/nfs4proc.c
index e89468678ae1,61a07dcb963d..000000000000
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@@ -5309,18 -5319,18 +5319,18 @@@ static int nfs4_read_done(struct rpc_ta
  				    nfs4_read_done_cb(task, hdr);
  }
  
 -#ifdef CONFIG_NFS_V4_2
 +#if defined CONFIG_NFS_V4_2 && defined CONFIG_NFS_V4_2_READ_PLUS
- static void nfs42_read_plus_support(struct nfs_server *server, struct rpc_message *msg)
+ static void nfs42_read_plus_support(struct nfs_pgio_header *hdr,
+ 				    struct rpc_message *msg)
  {
- 	if (server->caps & NFS_CAP_READ_PLUS)
+ 	/* Note: We don't use READ_PLUS with pNFS yet */
+ 	if (nfs_server_capable(hdr->inode, NFS_CAP_READ_PLUS) && !hdr->ds_clp)
  		msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS];
- 	else
- 		msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];
  }
  #else
- static void nfs42_read_plus_support(struct nfs_server *server, struct rpc_message *msg)
+ static void nfs42_read_plus_support(struct nfs_pgio_header *hdr,
+ 				    struct rpc_message *msg)
  {
- 	msg->rpc_proc = &nfs4_procedures[NFSPROC4_CLNT_READ];
  }
  #endif /* CONFIG_NFS_V4_2 */
  

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

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

[Trond Myklebust]

On Tue, 2020-12-15 at 11:24 +1100, Stephen Rothwell wrote:
> Hi all,
> 
> Today's linux-next merge of the nfs tree got a conflict in:
> 
>   fs/nfs/nfs4proc.c
> 
> between commit:
> 
>   21e31401fc45 ("NFS: Disable READ_PLUS by default")
> 
> from Linus' tree and commit:
> 
>   5c3485bb12c9 ("NFSv4.2/pnfs: Don't use READ_PLUS with pNFS yet")
> 
> from the nfs 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.
> 

Thanks Stephen!

Yes, the fixes for the client side READ_PLUS code ended up being a
little more extensive than hoped for in the last week of the 2.10
cycle, hence the need for a Kconfig option to disable it. Apologies for
the extra work it caused you.

Cheers
  Trond

-- 
Trond Myklebust
Linux NFS client maintainer, Hammerspace
trond.myklebust@hammerspace.com

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

[Stephen Rothwell]

Hi Trond,

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

  Documentation/admin-guide/kernel-parameters.txt

between commit:

  c0c74acbb60b ("docs: remove all references to AVR32 architecture")

from Linus' tree and commit:

  6d22323b2e9f ("nfs: remove the objlayout driver")

from the nfs 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 Documentation/admin-guide/kernel-parameters.txt
index 8d676d2a48ac,17156d66b124..000000000000
--- a/Documentation/admin-guide/kernel-parameters.txt
+++ b/Documentation/admin-guide/kernel-parameters.txt
@@@ -2419,13 -2419,7 +2419,7 @@@
  			and gids from such clients.  This is intended to ease
  			migration from NFSv2/v3.
  
- 	objlayoutdriver.osd_login_prog=
- 			[NFS] [OBJLAYOUT] sets the pathname to the program which
- 			is used to automatically discover and login into new
- 			osd-targets. Please see:
- 			Documentation/filesystems/pnfs.txt for more explanations
- 
 -	nmi_debug=	[KNL,AVR32,SH] Specify one or more actions to take
 +	nmi_debug=	[KNL,SH] Specify one or more actions to take
  			when a NMI is triggered.
  			Format: [state][,regs][,debounce][,die]
  

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

[Weston Andros Adamson]

> On May 18, 2016, at 8:40 PM, Stephen Rothwell <sfr@canb.auug.org.au> wrote:
> 
> Hi Trond,
> 
> Today's linux-next merge of the nfs tree got a conflict in:
> 
>  fs/nfs/direct.c
> 
> between commit:
> 
>  c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")
> 
> from Linus' tree and commit:
> 
>  ed3743a6d4f3 ("nfs: add debug to directio "good_bytes" counting")
> 
> from the nfs tree.

The merge of the nfs tree’s commit looks good to me.

-dros

> 
> 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/direct.c
> index 741a92c470bb,7f03163b5364..000000000000
> --- a/fs/nfs/direct.c
> +++ b/fs/nfs/direct.c
> @@@ -591,8 -596,8 +594,8 @@@ ssize_t nfs_file_direct_read(struct kio
>  		goto out_unlock;
> 
>  	dreq->inode = inode;
> - 	dreq->bytes_left = count;
> + 	dreq->bytes_left = dreq->max_count = count;
> -	dreq->io_start = pos;
> +	dreq->io_start = iocb->ki_pos;
>  	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));
>  	l_ctx = nfs_get_lock_context(dreq->ctx);
>  	if (IS_ERR(l_ctx)) {
> 

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

[Stephen Rothwell]

Hi Trond,

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

  fs/nfs/direct.c

between commit:

  c8b8e32d700f ("direct-io: eliminate the offset argument to ->direct_IO")

from Linus' tree and commit:

  ed3743a6d4f3 ("nfs: add debug to directio "good_bytes" counting")

from the nfs 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/direct.c
index 741a92c470bb,7f03163b5364..000000000000
--- a/fs/nfs/direct.c
+++ b/fs/nfs/direct.c
@@@ -591,8 -596,8 +594,8 @@@ ssize_t nfs_file_direct_read(struct kio
  		goto out_unlock;
  
  	dreq->inode = inode;
- 	dreq->bytes_left = count;
+ 	dreq->bytes_left = dreq->max_count = count;
 -	dreq->io_start = pos;
 +	dreq->io_start = iocb->ki_pos;
  	dreq->ctx = get_nfs_open_context(nfs_file_open_context(iocb->ki_filp));
  	l_ctx = nfs_get_lock_context(dreq->ctx);
  	if (IS_ERR(l_ctx)) {

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

[Stephen Rothwell]

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

Hi Trond,

Today's linux-next merge of the nfs tree got a conflict in
fs/nfs/nfs4proc.c between commit 26fe57502870 ("vfs: make it possible to
access the dentry hash/len as one 64-bit entry") from Linus' tree and
commit 778d28172f71 ("NFSv4: Simplify the NFSv4 REMOVE, LINK and RENAME
compounds") from the nfs tree.

Just context changes.  I fixed it up (see below) and can carry the fix as
necessary.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au

diff --cc fs/nfs/nfs4proc.c
index ab985f6,78784e5..0000000
--- a/fs/nfs/nfs4proc.c
+++ b/fs/nfs/nfs4proc.c
@@@ -2782,8 -2799,8 +2799,7 @@@ static int _nfs4_proc_remove(struct ino
  	struct nfs_server *server = NFS_SERVER(dir);
  	struct nfs_removeargs args = {
  		.fh = NFS_FH(dir),
 -		.name.len = name->len,
 -		.name.name = name->name,
 +		.name = *name,
- 		.bitmask = server->attr_bitmask,
  	};
  	struct nfs_removeres res = {
  		.server = server,

[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]

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

[David Howells]

Stephen Rothwell <sfr@canb.auug.org.au> wrote:

>  -static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct page *page)
>  +static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)

That is the correct fix.  I've it to my version of the patch.

David

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

[Stephen Rothwell]

Hi Trond,

Today's linux-next merge of the nfs tree got a conflict in fs/nfs/file.c
between commit c2ec175c39f62949438354f603f4aa170846aabb ("mm:
page_mkwrite change prototype to match fault") from Linus' tree and
commit e858675049961c24d12a9fb66aae6638ff30abb8 ("NFS: Add comment
banners to some NFS functions") from the nfs tree.

Just context changes.  I fixed it up (see below) and can carry the fix
for a while.
-- 
Cheers,
Stephen Rothwell                    sfr@canb.auug.org.au
http://www.canb.auug.org.au/~sfr/

diff --cc fs/nfs/file.c
index 0abf3f3,caf9be4..0000000
--- a/fs/nfs/file.c
+++ b/fs/nfs/file.c
@@@ -451,9 -478,13 +478,14 @@@ const struct address_space_operations n
  	.launder_page = nfs_launder_page,
  };
  
+ /*
+  * Notification that a PTE pointing to an NFS page is about to be made
+  * writable, implying that someone is about to modify the page through a
+  * shared-writable mapping
+  */
 -static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct page *page)
 +static int nfs_vm_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf)
  {
 +	struct page *page = vmf->page;
  	struct file *filp = vma->vm_file;
  	struct dentry *dentry = filp->f_path.dentry;
  	unsigned pagelen;