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 AB1112153E7; Mon, 13 Oct 2025 14:50:23 +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=1760367023; cv=none; b=idOETnFrBurUEPtv7imjSISMSWjdQbBNVx0zI0qKPkQmnR0PyRqzAIVzwPWM48nnVVY/FFDHIT8EoHTSPiYbFhyic3O6ATFT1QZawE0Vfisqckp5ZE2XY4DQsS5s5QtIFSR5gRe4WcbKdQWOjDtKE4YNKx0sQ8UTOmsuHEOM5/g= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1760367023; c=relaxed/simple; bh=ptiI6Jf/lz0GSq1fahyUByaNsiW54kdApN4r/PZZhQE=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=NBtiUpTq3PXUlpO+bqRmg7t9VkiYJQEY1MLDCzuAU5kPT0SpWs2y0y8AVvBerRDkXy15MqxCCvKJD/ktfGnZKv83HQC91LRtyukb3omEwIJeK2ezwBJDWnzMMinHxUq078pyzAwXD8o0y2DDjFxNHoaw1kCLzvJNgWEcknSsIkY= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=rOJxSWVC; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="rOJxSWVC" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 2BADDC4CEE7; Mon, 13 Oct 2025 14:50:22 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1760367023; bh=ptiI6Jf/lz0GSq1fahyUByaNsiW54kdApN4r/PZZhQE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=rOJxSWVC5sprPOXnd7x5Q66rA6+C9tnoXRuGOavNJYCUnFcHV5oExFtsk+GoZBq3/ rp3pmT3ymWlN4F/RzUBBix1OAew/e+3s1MmSMNVoxxXig8hUrcSAlVAwIUPWs6nsDO GHqRymohG8kAd5yO3YIAPk3YaC6G24Bkiof9LHNg= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Qianfeng Rong , John Garry , Bart Van Assche , Jens Axboe , Sasha Levin Subject: [PATCH 6.1 066/196] block: use int to store blk_stack_limits() return value Date: Mon, 13 Oct 2025 16:43:59 +0200 Message-ID: <20251013144316.968456185@linuxfoundation.org> X-Mailer: git-send-email 2.51.0 In-Reply-To: <20251013144314.549284796@linuxfoundation.org> References: <20251013144314.549284796@linuxfoundation.org> User-Agent: quilt/0.69 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: patches@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.1-stable review patch. If anyone has any objections, please let me know. ------------------ From: Qianfeng Rong [ Upstream commit b0b4518c992eb5f316c6e40ff186cbb7a5009518 ] Change the 'ret' variable in blk_stack_limits() from unsigned int to int, as it needs to store negative value -1. Storing the negative error codes in unsigned type, or performing equality comparisons (e.g., ret == -1), doesn't cause an issue at runtime [1] but can be confusing. Additionally, assigning negative error codes to unsigned type may trigger a GCC warning when the -Wsign-conversion flag is enabled. No effect on runtime. Link: https://lore.kernel.org/all/x3wogjf6vgpkisdhg3abzrx7v7zktmdnfmqeih5kosszmagqfs@oh3qxrgzkikf/ #1 Signed-off-by: Qianfeng Rong Reviewed-by: John Garry Fixes: fe0b393f2c0a ("block: Correct handling of bottom device misaligment") Reviewed-by: Bart Van Assche Link: https://lore.kernel.org/r/20250902130930.68317-1-rongqianfeng@vivo.com Signed-off-by: Jens Axboe Signed-off-by: Sasha Levin --- block/blk-settings.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/block/blk-settings.c b/block/blk-settings.c index 305b47a38429e..741c4085b9e45 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -547,7 +547,8 @@ static unsigned int blk_round_down_sectors(unsigned int sectors, unsigned int lb int blk_stack_limits(struct queue_limits *t, struct queue_limits *b, sector_t start) { - unsigned int top, bottom, alignment, ret = 0; + unsigned int top, bottom, alignment; + int ret = 0; t->max_sectors = min_not_zero(t->max_sectors, b->max_sectors); t->max_hw_sectors = min_not_zero(t->max_hw_sectors, b->max_hw_sectors); -- 2.51.0