all: Fix warnings found by gcc 9.3.0 and 9.3.1
Signed-off-by: Maciej Szwed <maciej.szwed@intel.com> Change-Id: Ie7c5b7b1c2d59a1f927eb5602f4ea5a003eff287 Reviewed-on: https://review.spdk.io/gerrit/c/spdk/spdk/+/2433 Tested-by: SPDK CI Jenkins <sys_sgci@intel.com> Community-CI: Broadcom CI Reviewed-by: Jim Harris <james.r.harris@intel.com> Reviewed-by: Ben Walker <benjamin.walker@intel.com> Reviewed-by: Shuhei Matsumoto <shuhei.matsumoto.xt@hitachi.com>
This commit is contained in:
parent
59ff57b93c
commit
a2606d4b5d
@ -151,7 +151,7 @@ static void ftl_evict_cache_entry(struct spdk_ftl_dev *dev, struct ftl_wbuf_entr
|
||||
static struct ftl_wbuf_entry *
|
||||
ftl_acquire_wbuf_entry(struct ftl_io_channel *io_channel, int io_flags)
|
||||
{
|
||||
struct ftl_wbuf_entry *entry;
|
||||
struct ftl_wbuf_entry *entry = NULL;
|
||||
uint32_t qdepth;
|
||||
|
||||
if (!(io_flags & FTL_IO_INTERNAL)) {
|
||||
@ -170,6 +170,8 @@ ftl_acquire_wbuf_entry(struct ftl_io_channel *io_channel, int io_flags)
|
||||
return NULL;
|
||||
}
|
||||
|
||||
assert(entry != NULL);
|
||||
|
||||
ftl_evict_cache_entry(io_channel->dev, entry);
|
||||
|
||||
entry->io_flags = io_flags;
|
||||
|
@ -141,7 +141,7 @@ spdk_vlog(enum spdk_log_level level, const char *file, const int line, const cha
|
||||
{
|
||||
int severity = LOG_INFO;
|
||||
char buf[MAX_TMPBUF];
|
||||
char timestamp[45];
|
||||
char timestamp[64];
|
||||
|
||||
if (g_log) {
|
||||
g_log(level, file, line, func, format, ap);
|
||||
|
@ -892,7 +892,7 @@ end:
|
||||
bool
|
||||
spdk_lvol_deletable(struct spdk_lvol *lvol)
|
||||
{
|
||||
size_t count;
|
||||
size_t count = 0;
|
||||
|
||||
spdk_blob_get_clones(lvol->lvol_store->blobstore, lvol->blob_id, NULL, &count);
|
||||
return (count == 0);
|
||||
|
@ -477,11 +477,11 @@ static void
|
||||
nvme_pcie_ctrlr_map_cmb(struct nvme_pcie_ctrlr *pctrlr)
|
||||
{
|
||||
int rc;
|
||||
void *addr;
|
||||
void *addr = NULL;
|
||||
uint32_t bir;
|
||||
union spdk_nvme_cmbsz_register cmbsz;
|
||||
union spdk_nvme_cmbloc_register cmbloc;
|
||||
uint64_t size, unit_size, offset, bar_size, bar_phys_addr;
|
||||
uint64_t size, unit_size, offset, bar_size = 0, bar_phys_addr = 0;
|
||||
|
||||
if (nvme_pcie_ctrlr_get_cmbsz(pctrlr, &cmbsz) ||
|
||||
nvme_pcie_ctrlr_get_cmbloc(pctrlr, &cmbloc)) {
|
||||
@ -660,18 +660,19 @@ static int
|
||||
nvme_pcie_ctrlr_allocate_bars(struct nvme_pcie_ctrlr *pctrlr)
|
||||
{
|
||||
int rc;
|
||||
void *addr;
|
||||
uint64_t phys_addr, size;
|
||||
void *addr = NULL;
|
||||
uint64_t phys_addr = 0, size = 0;
|
||||
|
||||
rc = spdk_pci_device_map_bar(pctrlr->devhandle, 0, &addr,
|
||||
&phys_addr, &size);
|
||||
pctrlr->regs = (volatile struct spdk_nvme_registers *)addr;
|
||||
if ((pctrlr->regs == NULL) || (rc != 0)) {
|
||||
|
||||
if ((addr == NULL) || (rc != 0)) {
|
||||
SPDK_ERRLOG("nvme_pcicfg_map_bar failed with rc %d or bar %p\n",
|
||||
rc, pctrlr->regs);
|
||||
rc, addr);
|
||||
return -1;
|
||||
}
|
||||
|
||||
pctrlr->regs = (volatile struct spdk_nvme_registers *)addr;
|
||||
pctrlr->regs_size = size;
|
||||
nvme_pcie_ctrlr_map_cmb(pctrlr);
|
||||
|
||||
|
@ -93,8 +93,8 @@ nvmf_bdev_ctrlr_complete_cmd(struct spdk_bdev_io *bdev_io, bool success,
|
||||
{
|
||||
struct spdk_nvmf_request *req = cb_arg;
|
||||
struct spdk_nvme_cpl *response = &req->rsp->nvme_cpl;
|
||||
int first_sc, first_sct, second_sc, second_sct;
|
||||
uint32_t cdw0;
|
||||
int first_sc = 0, first_sct = 0, second_sc = 0, second_sct = 0;
|
||||
uint32_t cdw0 = 0;
|
||||
struct spdk_nvmf_request *first_req = req->first_fused_req;
|
||||
|
||||
if (spdk_unlikely(first_req != NULL)) {
|
||||
|
@ -878,6 +878,8 @@ enum raid_level raid_bdev_parse_raid_level(const char *str)
|
||||
{
|
||||
unsigned int i;
|
||||
|
||||
assert(str != NULL);
|
||||
|
||||
for (i = 0; g_raid_level_names[i].name != NULL; i++) {
|
||||
if (strcasecmp(g_raid_level_names[i].name, str) == 0) {
|
||||
return g_raid_level_names[i].value;
|
||||
|
@ -201,7 +201,7 @@ decode_raid_level(const struct spdk_json_val *val, void *out)
|
||||
enum raid_level level;
|
||||
|
||||
ret = spdk_json_decode_string(val, &str);
|
||||
if (ret == 0) {
|
||||
if (ret == 0 && str != NULL) {
|
||||
level = raid_bdev_parse_raid_level(str);
|
||||
if (level == INVALID_RAID_LEVEL) {
|
||||
ret = -EINVAL;
|
||||
|
Loading…
Reference in New Issue
Block a user