From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id A992C1F4C82; Tue, 25 Mar 2025 18:42:48 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742928168; cv=none; b=VUQoZtuQ72Af5CaDabIddzPBa+nAdyyGF+sGfA9Tpo2UNE0B5I0rHKMkzW3Uqy5SQG0W++wtiNmcYiIK/P8SbqVijtQfNneuMylIrqOnMjnwZQd0fGfR+7BTCVM5113wbDxDzxJcjLsi/cKl1mYIZ2zSgJ54sTFJav08dgi3RdI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1742928168; c=relaxed/simple; bh=70LDVfYt6ryFikxs5Zc6nLO59eM2YSuiLbb1gCwwUno=; h=From:To:Cc:Subject:Date:Message-Id:In-Reply-To:References: MIME-Version; b=kkrL0vn8oNHs1bmq/bGsOADQV725NbcVfW22z0aImcboRrxBKhY6j/CoVtCQ2JmgFxR/Wl/1A6cZFLL/ZC3czT6A1rUOw2bDzRHW2GRhz5SG/CjXWRHd8K6uVSyvPSE2tBarY9v8aeb5LjCL5ig+gSFRSqRHzR0AMiEubBzmYfY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b=Rjz9shN2; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=kernel.org header.i=@kernel.org header.b="Rjz9shN2" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 1F160C4CEED; Tue, 25 Mar 2025 18:42:47 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1742928168; bh=70LDVfYt6ryFikxs5Zc6nLO59eM2YSuiLbb1gCwwUno=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=Rjz9shN2irRSBpxq/82Abq9qdU3ZlnrGxnI6XQ/V9K8PsuHFjPYNGvZk3zI8vGI0R zSMe9+G/e/nb6S4g11uoGMuIwMnoI9GngBH8kx/VbsfYYtC3gUrKgLPO1H6fRmKKhV kqaNOcP95W0H/xifnS6TH9ONRDn7MnygcmdNsh492sacpWJoN9HITT6jxvaj8i83TC 1JoLKAaXsIhrL7QLse2UZfgsOh0ZcCxKo/y1zlvBzTCHd5lz3XUimleXU7j31JqLVv 6CXUJ84zbJD2ybNSeSfReLxI98Or1jZal7iCTq1K9BPzN2rCEQvJPTybiY8ZE8Q/8x AR+lPKbZLloYw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: David Howells , "Paulo Alcantara (Red Hat)" , Jeff Layton , Viacheslav Dubeyko , Alex Markuze , Ilya Dryomov , ceph-devel@vger.kernel.org, linux-fsdevel@vger.kernel.org, Christian Brauner , Sasha Levin , netfs@lists.linux.dev Subject: [PATCH AUTOSEL 6.12 5/5] netfs: Fix netfs_unbuffered_read() to return ssize_t rather than int Date: Tue, 25 Mar 2025 14:42:35 -0400 Message-Id: <20250325184236.2152255-5-sashal@kernel.org> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250325184236.2152255-1-sashal@kernel.org> References: <20250325184236.2152255-1-sashal@kernel.org> Precedence: bulk X-Mailing-List: netfs@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.12.20 Content-Transfer-Encoding: 8bit From: David Howells [ Upstream commit 07c574eb53d4cc9aa7b985bc8bfcb302e5dc4694 ] Fix netfs_unbuffered_read() to return an ssize_t rather than an int as netfs_wait_for_read() returns ssize_t and this gets implicitly truncated. Signed-off-by: David Howells Link: https://lore.kernel.org/r/20250314164201.1993231-5-dhowells@redhat.com Acked-by: "Paulo Alcantara (Red Hat)" cc: Jeff Layton cc: Viacheslav Dubeyko cc: Alex Markuze cc: Ilya Dryomov cc: ceph-devel@vger.kernel.org cc: linux-fsdevel@vger.kernel.org Signed-off-by: Christian Brauner Signed-off-by: Sasha Levin --- fs/netfs/direct_read.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/fs/netfs/direct_read.c b/fs/netfs/direct_read.c index b1a66a6e6bc2d..917b7edc34ef5 100644 --- a/fs/netfs/direct_read.c +++ b/fs/netfs/direct_read.c @@ -108,9 +108,9 @@ static int netfs_dispatch_unbuffered_reads(struct netfs_io_request *rreq) * Perform a read to an application buffer, bypassing the pagecache and the * local disk cache. */ -static int netfs_unbuffered_read(struct netfs_io_request *rreq, bool sync) +static ssize_t netfs_unbuffered_read(struct netfs_io_request *rreq, bool sync) { - int ret; + ssize_t ret; _enter("R=%x %llx-%llx", rreq->debug_id, rreq->start, rreq->start + rreq->len - 1); @@ -149,7 +149,7 @@ static int netfs_unbuffered_read(struct netfs_io_request *rreq, bool sync) } out: - _leave(" = %d", ret); + _leave(" = %zd", ret); return ret; } -- 2.39.5