2020-12-15 00:38:58

by Stephen Rothwell

[permalink] [raw]

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

---

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 */

---

Attachments:

(No filename) (499.00 B)
OpenPGP digital signature

2020-12-15 00:42:34

by Trond Myklebust

[permalink] [raw]

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

---

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
[email protected]