forked fromtorvalds/linux
- Notifications
You must be signed in to change notification settings - Fork0
Commit6ffeb1c
md: change mddev 'chunk_sectors' from int to unsigned
Commite2782f5 ("Revert "dm raid: remove unnecessary discardlimits for raid10"") exposed compiler warnings introduced by commite0910c8 ("dm raid: fix discard limits for raid1 and raid10"):In file included from ./include/linux/kernel.h:14, from ./include/asm-generic/bug.h:20, from ./arch/x86/include/asm/bug.h:93, from ./include/linux/bug.h:5, from ./include/linux/mmdebug.h:5, from ./include/linux/gfp.h:5, from ./include/linux/slab.h:15, from drivers/md/dm-raid.c:8:drivers/md/dm-raid.c: In function ‘raid_io_hints’:./include/linux/minmax.h:18:28: warning: comparison of distinct pointer types lacks a cast (!!(sizeof((typeof(x) *)1 == (typeof(y) *)1))) ^~./include/linux/minmax.h:32:4: note: in expansion of macro ‘__typecheck’ (__typecheck(x, y) && __no_side_effects(x, y)) ^~~~~~~~~~~./include/linux/minmax.h:42:24: note: in expansion of macro ‘__safe_cmp’ __builtin_choose_expr(__safe_cmp(x, y), \ ^~~~~~~~~~./include/linux/minmax.h:51:19: note: in expansion of macro ‘__careful_cmp’ #define min(x, y) __careful_cmp(x, y, <) ^~~~~~~~~~~~~./include/linux/minmax.h:84:39: note: in expansion of macro ‘min’ __x == 0 ? __y : ((__y == 0) ? __x : min(__x, __y)); }) ^~~drivers/md/dm-raid.c:3739:33: note: in expansion of macro ‘min_not_zero’ limits->max_discard_sectors = min_not_zero(rs->md.chunk_sectors, ^~~~~~~~~~~~Fix this by changing the chunk_sectors member of 'struct mddev' fromint to 'unsigned int' to match the type used for the 'chunk_sectors'member of 'struct queue_limits'. Various MD code still uses 'int' butnone of it appears to ever make use of signed int; and storingpositive signed int in unsigned is perfectly safe.Reported-by: Song Liu <songliubraving@fb.com>Fixes:e2782f5 ("Revert "dm raid: remove unnecessary discard limits for raid10"")Fixes:e0910c8 ("dm raid: fix discard limits for raid1 and raid10")Cc: stable@vger,kernel.org #e0910c8 was marked for stable@Signed-off-by: Mike Snitzer <snitzer@redhat.com>Reviewed-by: Song Liu <song@kernel.org>Signed-off-by: Jens Axboe <axboe@kernel.dk>1 parent4223a5b commit6ffeb1c
1 file changed
+2
-2
lines changed| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
311 | 311 | | |
312 | 312 | | |
313 | 313 | | |
314 | | - | |
| 314 | + | |
315 | 315 | | |
316 | 316 | | |
317 | 317 | | |
| |||
339 | 339 | | |
340 | 340 | | |
341 | 341 | | |
342 | | - | |
| 342 | + | |
343 | 343 | | |
344 | 344 | | |
345 | 345 | | |
| |||
0 commit comments
Comments
(0)