From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Trond Myklebust <trond.myklebust@fys•uio.no>
Cc: linux-next@vger•kernel.org, linux-kernel@vger•kernel.org,
Christoph Hellwig <hch@lst•de>, Al Viro <viro@zeniv•linux.org.uk>,
Weston Andros Adamson <dros@primarydata•com>,
Anna Schumaker <Anna.Schumaker@Netapp•com>
Subject: linux-next: manual merge of the nfs tree with Linus' tree
Date: Thu, 19 May 2016 10:40:36 +1000 [thread overview]
Message-ID: <20160519104036.3f1ac7cf@canb.auug.org.au> (raw)
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)) {
next reply other threads:[~2016-05-19 0:40 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-05-19 0:40 Stephen Rothwell [this message]
2016-05-19 1:18 ` linux-next: manual merge of the nfs tree with Linus' tree Weston Andros Adamson
-- 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
2020-12-15 0:24 Stephen Rothwell
2020-12-15 0:30 ` Trond Myklebust
2017-05-03 0:07 Stephen Rothwell
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=20160519104036.3f1ac7cf@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=Anna.Schumaker@Netapp$(echo .)com \
--cc=dros@primarydata$(echo .)com \
--cc=hch@lst$(echo .)de \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=trond.myklebust@fys$(echo .)uio.no \
--cc=viro@zeniv$(echo .)linux.org.uk \
/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