lkml.org 
[lkml]   [2016]   [May]   [18]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
SubjectRe: linux-next: manual merge of the nfs tree with Linus' tree
Date

> 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)) {
>

\
 
 \ /
  Last update: 2016-05-19 03:41    [W:0.140 / U:0.012 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site