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, 13 Oct 2020 10:47:47 +1100
From:   Stephen Rothwell <sfr@canb.auug.org.au>
To:     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>,
        Max Reitz <mreitz@redhat.com>,
        Miklos Szeredi <mszeredi@redhat.com>
Subject: linux-next: manual merge of the fuse tree with Linus' tree
Message-ID: <20201013104747.559128e7@canb.auug.org.au>
MIME-Version: 1.0
Content-Type: multipart/signed; boundary="Sig_/h5hLElEIrFzfhb0L6gQk4_x";
 protocol="application/pgp-signature"; micalg=pgp-sha256
Precedence: bulk

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

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.

--=20
Cheers,
Stephen Rothwell

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 =3D ff->fc->async_dio;
 -	io->async =3D async_dio;
++	io->async =3D ff->fm->fc->async_dio;
  	io->iocb =3D iocb;
  	io->blocking =3D is_sync_kiocb(iocb);
 =20
 +	/* 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));
 +		shortened =3D count - iov_iter_count(iter);
 +		count -=3D shortened;
 +	}
 +
  	/*
  	 * We cannot asynchronously extend the size of a file.
  	 * In such case the aio will behave exactly like sync io.

--Sig_/h5hLElEIrFzfhb0L6gQk4_x
Content-Type: application/pgp-signature
Content-Description: OpenPGP digital signature

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

iQEzBAEBCAAdFiEENIC96giZ81tWdLgKAVBC80lX0GwFAl+E6yMACgkQAVBC80lX
0GwVLQf/Xcp+10ogecx1mL8vumFkhv4KP7guIxHq5/gp+XTvjgpU0mS9VlBnzb6W
pEhSG+PIlw7mzy2tahwFJkYA4ljF5rhBVk/NQi7r6t8GMQdR2XCx5IUF8blSS925
eBFQW5Ww4VjvfyUXxz/PCylw695nCicM8J8IGensszB1GYRwnr0mT0JMieybdJOY
m+xg5ove3Alp2gSHIC+t0I9cbpb0W7qCQCWWeuUztv+4Mjpym6atzwCnDa8reX6D
4xkKPhVL0DBKsEupWUzXMFYcQQpF/hHgWgQ7GRSw7QYiUOFEMMHg4PDZENdfyK6N
SV+P9lcwpY/d3gMq0NwUBLKbKMN42w==
=GCQ+
-----END PGP SIGNATURE-----

--Sig_/h5hLElEIrFzfhb0L6gQk4_x--