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:   Thu, 14 Dec 2023 19:45:18 +0100
From:   Ahelenia =?utf-8?Q?Ziemia=C5=84ska?= 
        <nabijaczleweli@nabijaczleweli.xyz>
Cc:     Jens Axboe <axboe@kernel.dk>,
        Christian Brauner <brauner@kernel.org>,
        Alexander Viro <viro@zeniv.linux.org.uk>,
        linux-fsdevel@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH RERESEND 11/11] splice: splice_to_socket: always request
 MSG_DONTWAIT
Message-ID: <2813e1805aa942862d300bec4d0563c5a466dce78.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103
References: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha512;
        protocol="application/pgp-signature"; boundary="ef7ptjqou3gwujpq"
Content-Disposition: inline
In-Reply-To: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
To:     unlisted-recipients:; (no To-header on input)
Precedence: bulk


--ef7ptjqou3gwujpq
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

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

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

iQIzBAABCgAdFiEEfWlHToQCjFzAxEFjvP0LAY0mWPEFAmV7TT4ACgkQvP0LAY0m
WPHoGA//WafMWyMpdgGZ2htkdb/yOw0yqvKt5rsq3pAso+znIfljltMCbJvX5plo
Dl59qaX/IfopYup0AfSVnl8iIWn2LcFHiF/K5dShyLfRqRLG4tIBvp+mI6N7203b
XPyfTvKt/mIwAO6AIeJtgCczb0drwpV8bobQQBAWBxXvxi828aPlXp0+KH8Ajjpr
Q89KVKfnooXkWEhVM7QOdh1pgxcinCfqz6aZrV1CgQrTkD+T/7nVBSqL90ue+g81
wSBTZF3k7rzfa3gifMC5LWoFgRxPAjrPowcgCUJJaDSWzNTOKOPNQoggAKulLTKc
5dh2ZKp0UHCep/CvzBNfZkWBYLsK0SQLMR+/Jxf8VK9hsE6ndQ4guhJ6SvD+KtA/
6Qo8hFrMJjsgQiPn+lDVbrwuJDZ9R8vGDVGk6YofM5v7QxMiKzRpuCISRBoKBvIX
VbFTFdLldwDmLBXWk3AYYu6k4j4fKit7+BRfI/OvbiYdUPkrYxEhzlDqvW10trrK
HYoaAoQ3UPXCkeP01wpXc4CT3LuGicGsvSpcd2VpRTvbHQNIDPH+jYHQacnycOr3
B2O1THWE9iyVmtepj+pXq76plWniBDguqnALzg+bkhPh4pJY3iqTAU741UYtlYVM
9BjwKVfJ3PRN/kHQZcwSPs8ZNrwOUF3W6YIxip4FglKgd3WdoxI=
=vAs0
-----END PGP SIGNATURE-----

--ef7ptjqou3gwujpq--