Skip to content

Commit b398f43

Browse files
committed
Merge branch 'for-6.11/block' into for-next
* for-6.11/block: block: Fix blk_validate_atomic_write_limits() build for arm32
2 parents 075aa2a + 8324bb7 commit b398f43

File tree

1 file changed

+1
-2
lines changed

1 file changed

+1
-2
lines changed

block/blk-settings.c

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,7 +175,6 @@ static void blk_atomic_writes_update_limits(struct queue_limits *lim)
175175

176176
static void blk_validate_atomic_write_limits(struct queue_limits *lim)
177177
{
178-
unsigned int chunk_sectors = lim->chunk_sectors;
179178
unsigned int boundary_sectors;
180179

181180
if (!lim->atomic_write_hw_max)
@@ -197,7 +196,7 @@ static void blk_validate_atomic_write_limits(struct queue_limits *lim)
197196
* Devices which do not conform to these rules can be dealt
198197
* with if and when they show up.
199198
*/
200-
if (WARN_ON_ONCE(do_div(chunk_sectors, boundary_sectors)))
199+
if (WARN_ON_ONCE(lim->chunk_sectors % boundary_sectors))
201200
goto unsupported;
202201

203202
/*

0 commit comments

Comments
 (0)