From: Christoph Hellwig <hch@lst.de>
Date: Tue, 19 Nov 2024 16:09:20 +0000 (+0100)
Subject: block: return unsigned int from blk_lim_dma_alignment_and_pad
X-Git-Tag: v6.13-rc1~10^2~10
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=e769489a54401d0c89555f7ad8672038b5c2b767;p=thirdparty%2Flinux.git

block: return unsigned int from blk_lim_dma_alignment_and_pad

The underlying limits are defined as unsigned int, so return that from
blk_lim_dma_alignment_and_pad as well.

Signed-off-by: Christoph Hellwig <hch@lst.de>
Reviewed-by: John Garry <john.g.garry@oracle.com>
Reviewed-by: Martin K. Petersen <martin.petersen@oracle.com>
Reviewed-by: Johannes Thumshirn <johannes.thumshirn@wdc.com>
Link: https://lore.kernel.org/r/20241119160932.1327864-4-hch@lst.de
Signed-off-by: Jens Axboe <axboe@kernel.dk>
---

diff --git a/include/linux/blkdev.h b/include/linux/blkdev.h
index d8de261c2b99a..d0d8190429c88 100644
--- a/include/linux/blkdev.h
+++ b/include/linux/blkdev.h
@@ -1462,7 +1462,8 @@ static inline bool bdev_iter_is_aligned(struct block_device *bdev,
 				   bdev_logical_block_size(bdev) - 1);
 }
 
-static inline int blk_lim_dma_alignment_and_pad(struct queue_limits *lim)
+static inline unsigned int
+blk_lim_dma_alignment_and_pad(struct queue_limits *lim)
 {
 	return lim->dma_alignment | lim->dma_pad_mask;
 }