From patchwork Thu Dec 14 18:45:04 2023
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-Patchwork-Submitter: =?utf-8?b?0L3QsNCx?=
 <nabijaczleweli@nabijaczleweli.xyz>
X-Patchwork-Id: 13493537
Authentication-Results: smtp.subspace.kernel.org;
	dkim=pass (2048-bit key) header.d=nabijaczleweli.xyz
 header.i=@nabijaczleweli.xyz header.b="QQwQ7kVs"
Received: from tarta.nabijaczleweli.xyz (tarta.nabijaczleweli.xyz
 [139.28.40.42])
	by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 4729518F;
	Thu, 14 Dec 2023 10:45:06 -0800 (PST)
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=nabijaczleweli.xyz;
	s=202305; t=1702579504;
	bh=2ssiVml4m8qqmo285KKEoUuoX6hT0FelEWEeDIquwac=;
	h=Date:From:Cc:Subject:References:In-Reply-To:From;
	b=QQwQ7kVsirDbfrc3qHB34GkO3GIFQTUF/vVWaXTL/s5rXafsrY3xyV9wYGYQw6HE/
	 ee4penYF7q4qAgMlMeUkYnDYfVtqNkPvfxpgAm7dd0HewSWdnH4LUcKglTmgoSaS0f
	 XIDSyCBKMi6S1fAjqdPtNgoDO6WjfMG/dlRUn1N+QD0EOGZiLN+MWnpBwJYpVOA4CT
	 DbRwvoAKPmKFmvxFpm+p/bHNtncRBSTw+2S+L5aaCDpYOHvtOu09tJOwycBNkRyspd
	 78rfnsknZQ+OLAhKmOl9E673CaExiP8CZCuqy994nyfaU/kBnZqUpkS+fSEahYSKn7
	 YJsxSs1dxmbKw==
Received: from tarta.nabijaczleweli.xyz (unknown [192.168.1.250])
	by tarta.nabijaczleweli.xyz (Postfix) with ESMTPSA id D6DF413794;
	Thu, 14 Dec 2023 19:45:04 +0100 (CET)
Date: Thu, 14 Dec 2023 19:45:04 +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,
	Andrew Morton <akpm@linux-foundation.org>,
 Hyeonggon Yoo <42.hyeyoo@gmail.com>,
	"Liam R. Howlett" <Liam.Howlett@oracle.com>,
 Pengcheng Yang <yangpc@wangsu.com>,
	Zhang Zhengming <zhang.zhengming@h3c.com>, Xu Panda <xu.panda@zte.com.cn>,
 Li kunyu <kunyu@nfschina.com>,
	Gavrilov Ilia <Ilia.Gavrilov@infotecs.ru>,
 Suren Baghdasaryan <surenb@google.com>,
	linux-kernel@vger.kernel.org
Subject: [PATCH RERESEND 05/11] relayfs: relay_file_splice_read: always
 return -EAGAIN for no data
Message-ID: 
 <2329ea2aecb56e982f16aea7c637fd0e8a7985506.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
User-Agent: NeoMutt/20231103
References: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>
Precedence: bulk
X-Mailing-List: linux-fsdevel@vger.kernel.org
List-Id: <linux-fsdevel.vger.kernel.org>
List-Subscribe: <mailto:linux-fsdevel+subscribe@vger.kernel.org>
List-Unsubscribe: <mailto:linux-fsdevel+unsubscribe@vger.kernel.org>
MIME-Version: 1.0
Content-Disposition: inline
In-Reply-To: <2cover.1697486714.git.nabijaczleweli@nabijaczleweli.xyz>

For consistency with the new "file->pipe reads non-blockingly" semantic.

Signed-off-by: Ahelenia Ziemiańska <nabijaczleweli@nabijaczleweli.xyz>
---
 kernel/relay.c | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/kernel/relay.c b/kernel/relay.c
index 83fe0325cde1..3d381e94a204 100644
--- a/kernel/relay.c
+++ b/kernel/relay.c
@@ -1215,8 +1215,7 @@ static ssize_t relay_file_splice_read(struct file *in,
 		if (ret < 0)
 			break;
 		else if (!ret) {
-			if (flags & SPLICE_F_NONBLOCK)
-				ret = -EAGAIN;
+			ret = -EAGAIN;
 			break;
 		}