Skip to content

Commit 8c40032

Browse files
committed
nvme: help compiler to figure out figuring init of variables
With some more aggressive CFLAGS/LDFLAGS optimized for size the compiler gets confused and can't figure out if ms is initialized or not. ../nvme.c:8567:20: error: ‘ms’ may be used uninitialized [-Werror=maybe-uninitialized] 8567 | if (ms && cfg.metadata_size < mbuffer_size) | ^ ../nvme.c:8356:15: note: ‘ms’ was declared here 8356 | __u16 ms; | ^~ Signed-off-by: Daniel Wagner <[email protected]>
1 parent 50ae7cb commit 8c40032

1 file changed

Lines changed: 2 additions & 8 deletions

File tree

nvme.c

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -8351,9 +8351,9 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
83518351
__u32 dsmgmt = 0;
83528352
int mode = 0644;
83538353
void *buffer;
8354+
__u16 ms = 0;
83548355
int err = 0;
83558356
int flags;
8356-
__u16 ms;
83578357

83588358
const char *start_block_addr = "64-bit addr of first block to access";
83598359
const char *block_size = "if specified, logical block size in bytes;\n"
@@ -8530,13 +8530,7 @@ static int submit_io(int opcode, char *command, const char *desc, int argc, char
85308530
} else {
85318531
err = get_pi_info(hdl, cfg.nsid, cfg.prinfo,
85328532
cfg.ilbrt, cfg.lbst, &logical_block_size, &ms);
8533-
if (err) {
8534-
logical_block_size = 0;
8535-
ms = 0;
8536-
pi_available = false;
8537-
} else {
8538-
pi_available = true;
8539-
}
8533+
pi_available = err == 0;
85408534
}
85418535

85428536
buffer_size = ((long long)cfg.block_count + 1) * logical_block_size;

0 commit comments

Comments
 (0)