diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 8e40da0937667a2e621814f02910adc158809487..4ca0a452d88e6ee439f98edf53b2031ce0a15883 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -4378,7 +4378,7 @@ static int rbd_init_disk(struct rbd_device *rbd_dev)
 	blk_queue_max_hw_sectors(q, segment_size / SECTOR_SIZE);
 	q->limits.max_sectors = queue_max_hw_sectors(q);
 	blk_queue_max_segments(q, USHRT_MAX);
-	blk_queue_max_segment_size(q, segment_size);
+	blk_queue_max_segment_size(q, UINT_MAX);
 	blk_queue_io_min(q, segment_size);
 	blk_queue_io_opt(q, segment_size);