Skip to content

Commit 9be0b62

Browse files
committed
TEMPORARY: fix gcc-4.8 warnings with latest patch set
1 parent a372dd1 commit 9be0b62

2 files changed

Lines changed: 5 additions & 5 deletions

File tree

libmpathpersist/mpath_persist_int.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -269,10 +269,10 @@ void preempt_missing_path(struct multipath *mpp, uint8_t *key, uint8_t *sa_key,
269269
int noisy)
270270
{
271271
uint8_t zero[8] = {0};
272-
struct prin_resp resp = {0};
272+
struct prin_resp resp = {{{0}}};
273273
int rq_scope;
274274
unsigned int rq_type;
275-
struct prout_param_descriptor paramp = {0};
275+
struct prout_param_descriptor paramp = {.sa_flags = 0};
276276
int status;
277277

278278
/*
@@ -494,7 +494,7 @@ static int mpath_prout_rel(struct multipath *mpp,int rq_servact, int rq_scope,
494494
int rc;
495495
int count = 0;
496496
int status = MPATH_PR_SUCCESS;
497-
struct prin_resp resp = {0};
497+
struct prin_resp resp = {{{0}}};
498498
uint16_t udev_flags = (mpp->skip_kpartx) ? MPATH_UDEV_NO_KPARTX_FLAG : 0;
499499
bool did_resume = false;
500500

@@ -670,7 +670,7 @@ static int mpath_prout_rel(struct multipath *mpp,int rq_servact, int rq_scope,
670670
static int reservation_key_matches(struct multipath *mpp, uint8_t *key,
671671
int noisy)
672672
{
673-
struct prin_resp resp = {0};
673+
struct prin_resp resp = {{{0}}};
674674
int status;
675675

676676
status = mpath_prin_activepath(mpp, MPATH_PRIN_RRES_SA, &resp, noisy);

multipathd/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4228,7 +4228,7 @@ main (int argc, char *argv[])
42284228

42294229
static void check_prhold(struct multipath *mpp, struct path *pp)
42304230
{
4231-
struct prin_resp resp = {0};
4231+
struct prin_resp resp = {{{0}}};
42324232
int status;
42334233

42344234
if (mpp->prflag == PR_UNSET) {

0 commit comments

Comments
 (0)