tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
fork atom

drbd: make limits unsigned

These are almost always used as unsigned integers, so mark them as such.

Signed-off-by: Christoph Böhmwalder <christoph.boehmwalder@linbit.com>
Reviewed-by: Joel Colledge <joel.colledge@linbit.com>
Link: https://lore.kernel.org/r/20230113123538.144276-4-christoph.boehmwalder@linbit.com
Signed-off-by: Jens Axboe <axboe@kernel.dk>

authored by

Christoph Böhmwalder and committed by
Jens Axboe c10bdcf9 21678796

+101 -101
+101 -101
include/linux/drbd_limits.h
··· 16 16 17 17 #define DEBUG_RANGE_CHECK 0 18 18 19 - #define DRBD_MINOR_COUNT_MIN 1 20 - #define DRBD_MINOR_COUNT_MAX 255 21 - #define DRBD_MINOR_COUNT_DEF 32 19 + #define DRBD_MINOR_COUNT_MIN 1U 20 + #define DRBD_MINOR_COUNT_MAX 255U 21 + #define DRBD_MINOR_COUNT_DEF 32U 22 22 #define DRBD_MINOR_COUNT_SCALE '1' 23 23 24 - #define DRBD_VOLUME_MAX 65534 24 + #define DRBD_VOLUME_MAX 65534U 25 25 26 - #define DRBD_DIALOG_REFRESH_MIN 0 27 - #define DRBD_DIALOG_REFRESH_MAX 600 26 + #define DRBD_DIALOG_REFRESH_MIN 0U 27 + #define DRBD_DIALOG_REFRESH_MAX 600U 28 28 #define DRBD_DIALOG_REFRESH_SCALE '1' 29 29 30 30 /* valid port number */ 31 - #define DRBD_PORT_MIN 1 32 - #define DRBD_PORT_MAX 0xffff 31 + #define DRBD_PORT_MIN 1U 32 + #define DRBD_PORT_MAX 0xffffU 33 33 #define DRBD_PORT_SCALE '1' 34 34 35 35 /* startup { */ 36 36 /* if you want more than 3.4 days, disable */ 37 - #define DRBD_WFC_TIMEOUT_MIN 0 38 - #define DRBD_WFC_TIMEOUT_MAX 300000 39 - #define DRBD_WFC_TIMEOUT_DEF 0 37 + #define DRBD_WFC_TIMEOUT_MIN 0U 38 + #define DRBD_WFC_TIMEOUT_MAX 300000U 39 + #define DRBD_WFC_TIMEOUT_DEF 0U 40 40 #define DRBD_WFC_TIMEOUT_SCALE '1' 41 41 42 - #define DRBD_DEGR_WFC_TIMEOUT_MIN 0 43 - #define DRBD_DEGR_WFC_TIMEOUT_MAX 300000 44 - #define DRBD_DEGR_WFC_TIMEOUT_DEF 0 42 + #define DRBD_DEGR_WFC_TIMEOUT_MIN 0U 43 + #define DRBD_DEGR_WFC_TIMEOUT_MAX 300000U 44 + #define DRBD_DEGR_WFC_TIMEOUT_DEF 0U 45 45 #define DRBD_DEGR_WFC_TIMEOUT_SCALE '1' 46 46 47 - #define DRBD_OUTDATED_WFC_TIMEOUT_MIN 0 48 - #define DRBD_OUTDATED_WFC_TIMEOUT_MAX 300000 49 - #define DRBD_OUTDATED_WFC_TIMEOUT_DEF 0 47 + #define DRBD_OUTDATED_WFC_TIMEOUT_MIN 0U 48 + #define DRBD_OUTDATED_WFC_TIMEOUT_MAX 300000U 49 + #define DRBD_OUTDATED_WFC_TIMEOUT_DEF 0U 50 50 #define DRBD_OUTDATED_WFC_TIMEOUT_SCALE '1' 51 51 /* }*/ 52 52 53 53 /* net { */ 54 54 /* timeout, unit centi seconds 55 55 * more than one minute timeout is not useful */ 56 - #define DRBD_TIMEOUT_MIN 1 57 - #define DRBD_TIMEOUT_MAX 600 58 - #define DRBD_TIMEOUT_DEF 60 /* 6 seconds */ 56 + #define DRBD_TIMEOUT_MIN 1U 57 + #define DRBD_TIMEOUT_MAX 600U 58 + #define DRBD_TIMEOUT_DEF 60U /* 6 seconds */ 59 59 #define DRBD_TIMEOUT_SCALE '1' 60 60 61 61 /* If backing disk takes longer than disk_timeout, mark the disk as failed */ 62 - #define DRBD_DISK_TIMEOUT_MIN 0 /* 0 = disabled */ 63 - #define DRBD_DISK_TIMEOUT_MAX 6000 /* 10 Minutes */ 64 - #define DRBD_DISK_TIMEOUT_DEF 0 /* disabled */ 62 + #define DRBD_DISK_TIMEOUT_MIN 0U /* 0 = disabled */ 63 + #define DRBD_DISK_TIMEOUT_MAX 6000U /* 10 Minutes */ 64 + #define DRBD_DISK_TIMEOUT_DEF 0U /* disabled */ 65 65 #define DRBD_DISK_TIMEOUT_SCALE '1' 66 66 67 67 /* active connection retries when C_WF_CONNECTION */ 68 - #define DRBD_CONNECT_INT_MIN 1 69 - #define DRBD_CONNECT_INT_MAX 120 70 - #define DRBD_CONNECT_INT_DEF 10 /* seconds */ 68 + #define DRBD_CONNECT_INT_MIN 1U 69 + #define DRBD_CONNECT_INT_MAX 120U 70 + #define DRBD_CONNECT_INT_DEF 10U /* seconds */ 71 71 #define DRBD_CONNECT_INT_SCALE '1' 72 72 73 73 /* keep-alive probes when idle */ 74 - #define DRBD_PING_INT_MIN 1 75 - #define DRBD_PING_INT_MAX 120 76 - #define DRBD_PING_INT_DEF 10 74 + #define DRBD_PING_INT_MIN 1U 75 + #define DRBD_PING_INT_MAX 120U 76 + #define DRBD_PING_INT_DEF 10U 77 77 #define DRBD_PING_INT_SCALE '1' 78 78 79 79 /* timeout for the ping packets.*/ 80 - #define DRBD_PING_TIMEO_MIN 1 81 - #define DRBD_PING_TIMEO_MAX 300 82 - #define DRBD_PING_TIMEO_DEF 5 80 + #define DRBD_PING_TIMEO_MIN 1U 81 + #define DRBD_PING_TIMEO_MAX 300U 82 + #define DRBD_PING_TIMEO_DEF 5U 83 83 #define DRBD_PING_TIMEO_SCALE '1' 84 84 85 85 /* max number of write requests between write barriers */ 86 - #define DRBD_MAX_EPOCH_SIZE_MIN 1 87 - #define DRBD_MAX_EPOCH_SIZE_MAX 20000 88 - #define DRBD_MAX_EPOCH_SIZE_DEF 2048 86 + #define DRBD_MAX_EPOCH_SIZE_MIN 1U 87 + #define DRBD_MAX_EPOCH_SIZE_MAX 20000U 88 + #define DRBD_MAX_EPOCH_SIZE_DEF 2048U 89 89 #define DRBD_MAX_EPOCH_SIZE_SCALE '1' 90 90 91 91 /* I don't think that a tcp send buffer of more than 10M is useful */ 92 - #define DRBD_SNDBUF_SIZE_MIN 0 93 - #define DRBD_SNDBUF_SIZE_MAX (10<<20) 94 - #define DRBD_SNDBUF_SIZE_DEF 0 92 + #define DRBD_SNDBUF_SIZE_MIN 0U 93 + #define DRBD_SNDBUF_SIZE_MAX (10U<<20) 94 + #define DRBD_SNDBUF_SIZE_DEF 0U 95 95 #define DRBD_SNDBUF_SIZE_SCALE '1' 96 96 97 - #define DRBD_RCVBUF_SIZE_MIN 0 98 - #define DRBD_RCVBUF_SIZE_MAX (10<<20) 99 - #define DRBD_RCVBUF_SIZE_DEF 0 97 + #define DRBD_RCVBUF_SIZE_MIN 0U 98 + #define DRBD_RCVBUF_SIZE_MAX (10U<<20) 99 + #define DRBD_RCVBUF_SIZE_DEF 0U 100 100 #define DRBD_RCVBUF_SIZE_SCALE '1' 101 101 102 102 /* @4k PageSize -> 128kB - 512MB */ 103 - #define DRBD_MAX_BUFFERS_MIN 32 104 - #define DRBD_MAX_BUFFERS_MAX 131072 105 - #define DRBD_MAX_BUFFERS_DEF 2048 103 + #define DRBD_MAX_BUFFERS_MIN 32U 104 + #define DRBD_MAX_BUFFERS_MAX 131072U 105 + #define DRBD_MAX_BUFFERS_DEF 2048U 106 106 #define DRBD_MAX_BUFFERS_SCALE '1' 107 107 108 108 /* @4k PageSize -> 4kB - 512MB */ 109 - #define DRBD_UNPLUG_WATERMARK_MIN 1 110 - #define DRBD_UNPLUG_WATERMARK_MAX 131072 109 + #define DRBD_UNPLUG_WATERMARK_MIN 1U 110 + #define DRBD_UNPLUG_WATERMARK_MAX 131072U 111 111 #define DRBD_UNPLUG_WATERMARK_DEF (DRBD_MAX_BUFFERS_DEF/16) 112 112 #define DRBD_UNPLUG_WATERMARK_SCALE '1' 113 113 114 114 /* 0 is disabled. 115 115 * 200 should be more than enough even for very short timeouts */ 116 - #define DRBD_KO_COUNT_MIN 0 117 - #define DRBD_KO_COUNT_MAX 200 118 - #define DRBD_KO_COUNT_DEF 7 116 + #define DRBD_KO_COUNT_MIN 0U 117 + #define DRBD_KO_COUNT_MAX 200U 118 + #define DRBD_KO_COUNT_DEF 7U 119 119 #define DRBD_KO_COUNT_SCALE '1' 120 120 /* } */ 121 121 122 122 /* syncer { */ 123 123 /* FIXME allow rate to be zero? */ 124 - #define DRBD_RESYNC_RATE_MIN 1 124 + #define DRBD_RESYNC_RATE_MIN 1U 125 125 /* channel bonding 10 GbE, or other hardware */ 126 126 #define DRBD_RESYNC_RATE_MAX (4 << 20) 127 - #define DRBD_RESYNC_RATE_DEF 250 127 + #define DRBD_RESYNC_RATE_DEF 250U 128 128 #define DRBD_RESYNC_RATE_SCALE 'k' /* kilobytes */ 129 129 130 - #define DRBD_AL_EXTENTS_MIN 67 130 + #define DRBD_AL_EXTENTS_MIN 67U 131 131 /* we use u16 as "slot number", (u16)~0 is "FREE". 132 132 * If you use >= 292 kB on-disk ring buffer, 133 133 * this is the maximum you can use: */ 134 - #define DRBD_AL_EXTENTS_MAX 0xfffe 135 - #define DRBD_AL_EXTENTS_DEF 1237 134 + #define DRBD_AL_EXTENTS_MAX 0xfffeU 135 + #define DRBD_AL_EXTENTS_DEF 1237U 136 136 #define DRBD_AL_EXTENTS_SCALE '1' 137 137 138 138 #define DRBD_MINOR_NUMBER_MIN -1 ··· 147 147 * the upper limit with 64bit kernel, enough ram and flexible meta data 148 148 * is 1 PiB, currently. */ 149 149 /* DRBD_MAX_SECTORS */ 150 - #define DRBD_DISK_SIZE_MIN 0 151 - #define DRBD_DISK_SIZE_MAX (1 * (2LLU << 40)) 152 - #define DRBD_DISK_SIZE_DEF 0 /* = disabled = no user size... */ 150 + #define DRBD_DISK_SIZE_MIN 0LLU 151 + #define DRBD_DISK_SIZE_MAX (1LLU * (2LLU << 40)) 152 + #define DRBD_DISK_SIZE_DEF 0LLU /* = disabled = no user size... */ 153 153 #define DRBD_DISK_SIZE_SCALE 's' /* sectors */ 154 154 155 155 #define DRBD_ON_IO_ERROR_DEF EP_DETACH ··· 162 162 #define DRBD_ON_CONGESTION_DEF OC_BLOCK 163 163 #define DRBD_READ_BALANCING_DEF RB_PREFER_LOCAL 164 164 165 - #define DRBD_MAX_BIO_BVECS_MIN 0 166 - #define DRBD_MAX_BIO_BVECS_MAX 128 167 - #define DRBD_MAX_BIO_BVECS_DEF 0 165 + #define DRBD_MAX_BIO_BVECS_MIN 0U 166 + #define DRBD_MAX_BIO_BVECS_MAX 128U 167 + #define DRBD_MAX_BIO_BVECS_DEF 0U 168 168 #define DRBD_MAX_BIO_BVECS_SCALE '1' 169 169 170 - #define DRBD_C_PLAN_AHEAD_MIN 0 171 - #define DRBD_C_PLAN_AHEAD_MAX 300 172 - #define DRBD_C_PLAN_AHEAD_DEF 20 170 + #define DRBD_C_PLAN_AHEAD_MIN 0U 171 + #define DRBD_C_PLAN_AHEAD_MAX 300U 172 + #define DRBD_C_PLAN_AHEAD_DEF 20U 173 173 #define DRBD_C_PLAN_AHEAD_SCALE '1' 174 174 175 - #define DRBD_C_DELAY_TARGET_MIN 1 176 - #define DRBD_C_DELAY_TARGET_MAX 100 177 - #define DRBD_C_DELAY_TARGET_DEF 10 175 + #define DRBD_C_DELAY_TARGET_MIN 1U 176 + #define DRBD_C_DELAY_TARGET_MAX 100U 177 + #define DRBD_C_DELAY_TARGET_DEF 10U 178 178 #define DRBD_C_DELAY_TARGET_SCALE '1' 179 179 180 - #define DRBD_C_FILL_TARGET_MIN 0 181 - #define DRBD_C_FILL_TARGET_MAX (1<<20) /* 500MByte in sec */ 182 - #define DRBD_C_FILL_TARGET_DEF 100 /* Try to place 50KiB in socket send buffer during resync */ 180 + #define DRBD_C_FILL_TARGET_MIN 0U 181 + #define DRBD_C_FILL_TARGET_MAX (1U<<20) /* 500MByte in sec */ 182 + #define DRBD_C_FILL_TARGET_DEF 100U /* Try to place 50KiB in socket send buffer during resync */ 183 183 #define DRBD_C_FILL_TARGET_SCALE 's' /* sectors */ 184 184 185 - #define DRBD_C_MAX_RATE_MIN 250 186 - #define DRBD_C_MAX_RATE_MAX (4 << 20) 187 - #define DRBD_C_MAX_RATE_DEF 102400 185 + #define DRBD_C_MAX_RATE_MIN 250U 186 + #define DRBD_C_MAX_RATE_MAX (4U << 20) 187 + #define DRBD_C_MAX_RATE_DEF 102400U 188 188 #define DRBD_C_MAX_RATE_SCALE 'k' /* kilobytes */ 189 189 190 - #define DRBD_C_MIN_RATE_MIN 0 191 - #define DRBD_C_MIN_RATE_MAX (4 << 20) 192 - #define DRBD_C_MIN_RATE_DEF 250 190 + #define DRBD_C_MIN_RATE_MIN 0U 191 + #define DRBD_C_MIN_RATE_MAX (4U << 20) 192 + #define DRBD_C_MIN_RATE_DEF 250U 193 193 #define DRBD_C_MIN_RATE_SCALE 'k' /* kilobytes */ 194 194 195 - #define DRBD_CONG_FILL_MIN 0 196 - #define DRBD_CONG_FILL_MAX (10<<21) /* 10GByte in sectors */ 197 - #define DRBD_CONG_FILL_DEF 0 195 + #define DRBD_CONG_FILL_MIN 0U 196 + #define DRBD_CONG_FILL_MAX (10U<<21) /* 10GByte in sectors */ 197 + #define DRBD_CONG_FILL_DEF 0U 198 198 #define DRBD_CONG_FILL_SCALE 's' /* sectors */ 199 199 200 200 #define DRBD_CONG_EXTENTS_MIN DRBD_AL_EXTENTS_MIN ··· 204 204 205 205 #define DRBD_PROTOCOL_DEF DRBD_PROT_C 206 206 207 - #define DRBD_DISK_BARRIER_DEF 0 208 - #define DRBD_DISK_FLUSHES_DEF 1 209 - #define DRBD_DISK_DRAIN_DEF 1 210 - #define DRBD_MD_FLUSHES_DEF 1 211 - #define DRBD_TCP_CORK_DEF 1 212 - #define DRBD_AL_UPDATES_DEF 1 207 + #define DRBD_DISK_BARRIER_DEF 0U 208 + #define DRBD_DISK_FLUSHES_DEF 1U 209 + #define DRBD_DISK_DRAIN_DEF 1U 210 + #define DRBD_MD_FLUSHES_DEF 1U 211 + #define DRBD_TCP_CORK_DEF 1U 212 + #define DRBD_AL_UPDATES_DEF 1U 213 213 214 214 /* We used to ignore the discard_zeroes_data setting. 215 215 * To not change established (and expected) behaviour, 216 216 * by default assume that, for discard_zeroes_data=0, 217 217 * we can make that an effective discard_zeroes_data=1, 218 218 * if we only explicitly zero-out unaligned partial chunks. */ 219 - #define DRBD_DISCARD_ZEROES_IF_ALIGNED_DEF 1 219 + #define DRBD_DISCARD_ZEROES_IF_ALIGNED_DEF 1U 220 220 221 221 /* Some backends pretend to support WRITE SAME, 222 222 * but fail such requests when they are actually submitted. 223 223 * This is to tell DRBD to not even try. */ 224 - #define DRBD_DISABLE_WRITE_SAME_DEF 0 224 + #define DRBD_DISABLE_WRITE_SAME_DEF 0U 225 225 226 - #define DRBD_ALLOW_TWO_PRIMARIES_DEF 0 227 - #define DRBD_ALWAYS_ASBP_DEF 0 228 - #define DRBD_USE_RLE_DEF 1 229 - #define DRBD_CSUMS_AFTER_CRASH_ONLY_DEF 0 226 + #define DRBD_ALLOW_TWO_PRIMARIES_DEF 0U 227 + #define DRBD_ALWAYS_ASBP_DEF 0U 228 + #define DRBD_USE_RLE_DEF 1U 229 + #define DRBD_CSUMS_AFTER_CRASH_ONLY_DEF 0U 230 230 231 - #define DRBD_AL_STRIPES_MIN 1 232 - #define DRBD_AL_STRIPES_MAX 1024 233 - #define DRBD_AL_STRIPES_DEF 1 231 + #define DRBD_AL_STRIPES_MIN 1U 232 + #define DRBD_AL_STRIPES_MAX 1024U 233 + #define DRBD_AL_STRIPES_DEF 1U 234 234 #define DRBD_AL_STRIPES_SCALE '1' 235 235 236 - #define DRBD_AL_STRIPE_SIZE_MIN 4 237 - #define DRBD_AL_STRIPE_SIZE_MAX 16777216 238 - #define DRBD_AL_STRIPE_SIZE_DEF 32 236 + #define DRBD_AL_STRIPE_SIZE_MIN 4U 237 + #define DRBD_AL_STRIPE_SIZE_MAX 16777216U 238 + #define DRBD_AL_STRIPE_SIZE_DEF 32U 239 239 #define DRBD_AL_STRIPE_SIZE_SCALE 'k' /* kilobytes */ 240 240 241 - #define DRBD_SOCKET_CHECK_TIMEO_MIN 0 241 + #define DRBD_SOCKET_CHECK_TIMEO_MIN 0U 242 242 #define DRBD_SOCKET_CHECK_TIMEO_MAX DRBD_PING_TIMEO_MAX 243 - #define DRBD_SOCKET_CHECK_TIMEO_DEF 0 243 + #define DRBD_SOCKET_CHECK_TIMEO_DEF 0U 244 244 #define DRBD_SOCKET_CHECK_TIMEO_SCALE '1' 245 245 246 - #define DRBD_RS_DISCARD_GRANULARITY_MIN 0 247 - #define DRBD_RS_DISCARD_GRANULARITY_MAX (1<<20) /* 1MiByte */ 248 - #define DRBD_RS_DISCARD_GRANULARITY_DEF 0 /* disabled by default */ 246 + #define DRBD_RS_DISCARD_GRANULARITY_MIN 0U 247 + #define DRBD_RS_DISCARD_GRANULARITY_MAX (1U<<20) /* 1MiByte */ 248 + #define DRBD_RS_DISCARD_GRANULARITY_DEF 0U /* disabled by default */ 249 249 #define DRBD_RS_DISCARD_GRANULARITY_SCALE '1' /* bytes */ 250 250 251 251 #endif