From: Max Reitz <mreitz@redhat•com>
To: Stephen Rothwell <sfr@canb•auug.org.au>,
Miklos Szeredi <miklos@szeredi•hu>
Cc: Al Viro <viro@zeniv•linux.org.uk>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Linux Next Mailing List <linux-next@vger•kernel.org>,
Miklos Szeredi <mszeredi@redhat•com>
Subject: Re: linux-next: manual merge of the fuse tree with Linus' tree
Date: Tue, 13 Oct 2020 13:22:38 +0200 [thread overview]
Message-ID: <8d19d870-a9b2-d3e1-c3f1-c86d8f910e92@redhat.com> (raw)
In-Reply-To: <20201013104747.559128e7@canb.auug.org.au>
[-- Attachment #1.1: Type: text/plain, Size: 2090 bytes --]
On 13.10.20 01:47, Stephen Rothwell wrote:
> Hi all,
>
> Today's linux-next merge of the fuse tree got a conflict in:
>
> fs/fuse/file.c
>
> between commit:
>
> 933a3752babc ("fuse: fix the ->direct_IO() treatment of iov_iter")
>
> from Linus' tree and commit:
>
> fcee216beb9c ("fuse: split fuse_mount off of fuse_conn")
>
> from the fuse 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! Semantically, the change looks good to me, I just noticed
something about the indentation:
> diff --cc fs/fuse/file.c
> index 43c165e796da,53d4dd1ab992..000000000000
> --- a/fs/fuse/file.c
> +++ b/fs/fuse/file.c
> @@@ -3120,17 -3156,10 +3146,18 @@@ fuse_direct_IO(struct kiocb *iocb, stru
> * By default, we want to optimize all I/Os with async request
> * submission to the client filesystem if supported.
> */
> - io->async = ff->fc->async_dio;
> - io->async = async_dio;
> ++ io->async = ff->fm->fc->async_dio;
> io->iocb = iocb;
> io->blocking = is_sync_kiocb(iocb);
>
> + /* optimization for short read */
> + if (io->async && !io->write && offset + count > i_size) {
> - iov_iter_truncate(iter, fuse_round_up(ff->fc, i_size - offset));
> ++ iov_iter_truncate(iter, fuse_round_up(ff->fm->fc,
> ++ i_size - offset));
Personally, I’d align this second line to the opening parenthesis of
fuse_round_up() (as it is done in fcee216beb9c, in a hunk not shown
here, probably because it’s been dropped in the merge.).
Max
> + shortened = count - iov_iter_count(iter);
> + count -= shortened;
> + }
> +
> /*
> * We cannot asynchronously extend the size of a file.
> * In such case the aio will behave exactly like sync io.
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
next prev parent reply other threads:[~2020-10-13 11:22 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-10-12 23:47 linux-next: manual merge of the fuse tree with Linus' tree Stephen Rothwell
2020-10-13 11:22 ` Max Reitz [this message]
-- strict thread matches above, loose matches on Subject: below --
2025-01-29 22:32 Stephen Rothwell
2025-02-05 8:59 ` Joel Granados
2024-03-05 23:34 Stephen Rothwell
2024-03-07 14:16 ` Miklos Szeredi
2024-03-07 21:34 ` Stephen Rothwell
2024-02-25 23:55 Stephen Rothwell
2022-10-12 22:59 Stephen Rothwell
2020-02-06 21:54 Stephen Rothwell
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=8d19d870-a9b2-d3e1-c3f1-c86d8f910e92@redhat.com \
--to=mreitz@redhat$(echo .)com \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=mszeredi@redhat$(echo .)com \
--cc=sfr@canb$(echo .)auug.org.au \
--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