Skip to content

Commit f1536c3

Browse files
committed
Merge: loop: fix type of block size
MR: https://gitlab.com/redhat/centos-stream/src/kernel/centos-stream-9/-/merge_requests/5975 JIRA: https://issues.redhat.com/browse/RHEL-63718 Signed-off-by: Ming Lei <ming.lei@redhat.com> Approved-by: Jeff Moyer <jmoyer@redhat.com> Approved-by: Chris Leech <cleech@redhat.com> Approved-by: CKI KWF Bot <cki-ci-bot+kwf-gitlab-com@redhat.com> Merged-by: Rado Vrbovsky <rvrbovsk@redhat.com>
2 parents 66a2df8 + b53d47f commit f1536c3

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/block/loop.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,7 +173,7 @@ static loff_t get_loop_size(struct loop_device *lo, struct file *file)
173173
static bool lo_bdev_can_use_dio(struct loop_device *lo,
174174
struct block_device *backing_bdev)
175175
{
176-
unsigned short sb_bsize = bdev_logical_block_size(backing_bdev);
176+
unsigned int sb_bsize = bdev_logical_block_size(backing_bdev);
177177

178178
if (queue_logical_block_size(lo->lo_queue) < sb_bsize)
179179
return false;
@@ -979,7 +979,7 @@ loop_set_status_from_info(struct loop_device *lo,
979979
return 0;
980980
}
981981

982-
static unsigned short loop_default_blocksize(struct loop_device *lo,
982+
static unsigned int loop_default_blocksize(struct loop_device *lo,
983983
struct block_device *backing_bdev)
984984
{
985985
/* In case of direct I/O, match underlying block size */
@@ -988,7 +988,7 @@ static unsigned short loop_default_blocksize(struct loop_device *lo,
988988
return SECTOR_SIZE;
989989
}
990990

991-
static int loop_reconfigure_limits(struct loop_device *lo, unsigned short bsize)
991+
static int loop_reconfigure_limits(struct loop_device *lo, unsigned int bsize)
992992
{
993993
struct file *file = lo->lo_backing_file;
994994
struct inode *inode = file->f_mapping->host;

0 commit comments

Comments
 (0)