Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::3:1 as permitted sender) client-ip=2620:137:e000::3:1;
Date:   Tue, 12 Dec 2023 11:13:00 +0100
From:   Ahelenia =?utf-8?Q?Ziemia=C5=84ska?= 
        <nabijaczleweli@nabijaczleweli.xyz>
To:     Alexander Viro <viro@zeniv.linux.org.uk>,
        Christian Brauner <brauner@kernel.org>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH RESEND 11/11] splice: splice_to_socket: always request
 MSG_DONTWAIT
Message-ID: <1813e1805aa942862d300bec4d0563c5a466dce78.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103
References: <cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="wcobgse6hj3ubesx"
Content-Disposition: inline
In-Reply-To: <1cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
Precedence: bulk


--wcobgse6hj3ubesx
Content-Type: text/plain; charset=utf-8
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

Otherwise we risk sleeping with the pipe locked for indeterminate
lengths of time.

Signed-off-by: Ahelenia Ziemia=C5=84ska <nabijaczleweli@nabijaczleweli.xyz>
---
 fs/splice.c | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/fs/splice.c b/fs/splice.c
index 81788bf7daa1..d5885032f9a8 100644
--- a/fs/splice.c
+++ b/fs/splice.c
@@ -869,13 +869,11 @@ ssize_t splice_to_socket(struct pipe_inode_info *pipe=
, struct file *out,
 		if (!bc)
 			break;
=20
-		msg.msg_flags =3D MSG_SPLICE_PAGES;
+		msg.msg_flags =3D MSG_SPLICE_PAGES | MSG_DONTWAIT;
 		if (flags & SPLICE_F_MORE)
 			msg.msg_flags |=3D MSG_MORE;
 		if (remain && pipe_occupancy(pipe->head, tail) > 0)
 			msg.msg_flags |=3D MSG_MORE;
-		if (out->f_flags & O_NONBLOCK)
-			msg.msg_flags |=3D MSG_DONTWAIT;
=20
 		iov_iter_bvec(&msg.msg_iter, ITER_SOURCE, bvec, bc,
 			      len - remain);
--=20
2.39.2

--wcobgse6hj3ubesx
Content-Type: application/pgp-signature; name="signature.asc"

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmV4MisACgkQvP0LAY0m
WPGwRxAAs6fr478UQ2p25vI1thcEvzX4w5WUOAwBkLcqvY9dMJZ7vZTzRqlmIFnO
IiI7kNBIre5AaHQn8I2d7YQddxrurwLLa5MkuvdfxSRzOt3lU6jsZotQKCg1pAmh
vJqsRNkQk0n0w7HTsx/xBTYFbw73DiJGxYJrdYdhhd7W66rVCr7lc8SuOPXG67sG
ngKc80p1H3XASjYpXHuKSF//z0QNRPZt/YbSVNFFMJ0CjJoIb8XjOsPvtVSnl7Hq
iVOE/mpqDpsBuibIVk/iPTWYRrt0RiHl7jIMcTaEpr5AZ8T0kn4wapEbISmBxhU7
Tn5FH3QH76qSZWBrbD/fuh1OTdQbqUDlCSSwOS44M3Y3Indafsor+8D+RxpY46Fl
9BedCQqc+dPTNtEeL8R1b6PUn7BPug0h/M+L7U3TT1burIAqgmaGGaqIK49Pps8Y
c1pH1bx4BWWB4F75amTC+A0uZEWCKnA/4BORvMTpATwBnsPOngznOREP3yzoNoiR
1QdmcJL7YAs52Nq219+RM5CEJhQqA1Y6vGAHA2WWOMsoue8su8FhMO/SL9dafcq+
Tvw6BW1jnxUdeOOK5I4eOwzTIi8B7FoJNk8O6E5I9YWwxPPk79v6MnICMKVCNcSQ
4BIxIGjVD6EhR6GowE44L19F8GBFkiJKe8Lx/iOyW3AyLjUElBM=
=NDdt
-----END PGP SIGNATURE-----

--wcobgse6hj3ubesx--