Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18;
Date:   Tue, 15 Dec 2020 11:24:58 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     Trond Myklebust <trondmy@gmail.com>
Cc:     Anna Schumaker <Anna.Schumaker@Netapp.com>,
        Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
        Linux Next Mailing List <linux-next@vger.kernel.org>,
        Trond Myklebust <trond.myklebust@hammerspace.com>
Subject: linux-next: manual merge of the nfs tree with Linus' tree
Message-ID: <20201215112458.4081eb26@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/66g5Ef/Gg2BOOj05mVBh5PK";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

--Sig_/66g5Ef/Gg2BOOj05mVBh5PK
Content-Type: text/plain; charset=US-ASCII
Content-Transfer-Encoding: quoted-printable

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.

--=20
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);
  }
 =20
 -#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 =3D &nfs4_procedures[NFSPROC4_CLNT_READ_PLUS];
- 	else
- 		msg->rpc_proc =3D &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 =3D &nfs4_procedures[NFSPROC4_CLNT_READ];
  }
  #endif /* CONFIG_NFS_V4_2 */
 =20

--Sig_/66g5Ef/Gg2BOOj05mVBh5PK
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

-----BEGIN PGP SIGNATURE-----

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl/YAloACgkQAVBC80lX
0Gxc/Af7Bia8okK4+lt+8FqgXtZV8/u0SvU59XR0dofcsvbaN7dYCjHkn7VdfHCj
O9KOe0qyiYQ3PyZKEQz057E3Tr4277mGCkVVSic6zrklSCXcCn+CCgjHpQn14IPW
mvI7Z6IsIFLDaF6qGtBiA2XNibQKHSLPdX0bQC7BVy8VIJQLL0BbWnVmxI2WWw5+
JIAURHpEtSTk137q5G/zgEOyjPlTFIUV5f4j4eSOQMzGKeYnxqJ3mNWahzjYLD0y
LAkyL2xUW+FZ837o3ZPBIxzkjcjyj/L/QK9QFWBTQdsiMHtm6qGfjO686brbDUCH
I2PxIGFW+Cbpwk975uoYPgzi0K2BPg==
=BGK5
-----END PGP SIGNATURE-----

--Sig_/66g5Ef/Gg2BOOj05mVBh5PK--