From: Qianfeng Rong Date: Tue, 2 Sep 2025 13:09:30 +0000 (+0800) Subject: block: use int to store blk_stack_limits() return value X-Git-Tag: v6.18-rc1~136^2~93 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=b0b4518c992eb5f316c6e40ff186cbb7a5009518;p=thirdparty%2Fkernel%2Fstable.git block: use int to store blk_stack_limits() return value 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 --- diff --git a/block/blk-settings.c b/block/blk-settings.c index d6438e6c276dc..693bc8d20acf3 100644 --- a/block/blk-settings.c +++ b/block/blk-settings.c @@ -763,7 +763,8 @@ unsupported: 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->features |= (b->features & BLK_FEAT_INHERIT_MASK);