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
Date: Tue, 15 Dec 2020 11:24:58 +1100 [thread overview]
Message-ID: <20201215112458.4081eb26@canb.auug.org.au> (raw)
[-- 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 --]
next reply other threads:[~2020-12-15 0:26 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-12-15 0:24 Stephen Rothwell [this message]
2020-12-15 0:30 ` linux-next: manual merge of the nfs tree with Linus' tree Trond Myklebust
-- strict thread matches above, loose matches on Subject: below --
2025-12-05 0:19 Stephen Rothwell
2025-12-05 0:34 ` Trond Myklebust
2025-12-05 1:11 ` Mike Snitzer
2017-05-03 0:07 Stephen Rothwell
2016-05-19 0:40 Stephen Rothwell
2016-05-19 1:18 ` Weston Andros Adamson
2012-05-22 2:10 Stephen Rothwell
2009-04-02 0:41 Stephen Rothwell
2009-04-02 8:56 ` David Howells
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201215112458.4081eb26@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Anna.Schumaker@Netapp$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=trond.myklebust@hammerspace$(echo .)com \
--cc=trondmy@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox