| Message ID | 20210312105530.2219008-7-lee.jones@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | Rid W=1 warnings from Block | expand |
On Fri, Mar 12, 2021 at 11:57 AM Lee Jones <lee.jones@linaro.org> wrote: > > [P_RETRY_WRITE] is initialised more than once. > > Fixes the following W=1 kernel build warning(s): > > drivers/block/drbd/drbd_main.c: In function ‘cmdname’: > drivers/block/drbd/drbd_main.c:3660:22: warning: initialized field overwritten [-Woverride-init] > drivers/block/drbd/drbd_main.c:3660:22: note: (near initialization for ‘cmdnames[44]’) > > Cc: Philipp Reisner <philipp.reisner@linbit.com> > Cc: Lars Ellenberg <lars.ellenberg@linbit.com> > Cc: Jens Axboe <axboe@kernel.dk> > Cc: drbd-dev@lists.linbit.com > Cc: linux-block@vger.kernel.org > Signed-off-by: Lee Jones <lee.jones@linaro.org> Looks correct. I had actually posted a slightly different fix last year, but either one addresses the warning: https://lore.kernel.org/lkml/20201026215043.3893318-1-arnd@kernel.org/ Arnd
diff --git a/drivers/block/drbd/drbd_main.c b/drivers/block/drbd/drbd_main.c index 25cd8a2f729db..69c9640d407df 100644 --- a/drivers/block/drbd/drbd_main.c +++ b/drivers/block/drbd/drbd_main.c @@ -3657,7 +3657,6 @@ const char *cmdname(enum drbd_packet cmd) [P_RS_CANCEL] = "RSCancel", [P_CONN_ST_CHG_REQ] = "conn_st_chg_req", [P_CONN_ST_CHG_REPLY] = "conn_st_chg_reply", - [P_RETRY_WRITE] = "retry_write", [P_PROTOCOL_UPDATE] = "protocol_update", [P_RS_THIN_REQ] = "rs_thin_req", [P_RS_DEALLOCATED] = "rs_deallocated",
[P_RETRY_WRITE] is initialised more than once. Fixes the following W=1 kernel build warning(s): drivers/block/drbd/drbd_main.c: In function ‘cmdname’: drivers/block/drbd/drbd_main.c:3660:22: warning: initialized field overwritten [-Woverride-init] drivers/block/drbd/drbd_main.c:3660:22: note: (near initialization for ‘cmdnames[44]’) Cc: Philipp Reisner <philipp.reisner@linbit.com> Cc: Lars Ellenberg <lars.ellenberg@linbit.com> Cc: Jens Axboe <axboe@kernel.dk> Cc: drbd-dev@lists.linbit.com Cc: linux-block@vger.kernel.org Signed-off-by: Lee Jones <lee.jones@linaro.org> --- drivers/block/drbd/drbd_main.c | 1 - 1 file changed, 1 deletion(-)