lkml.org 
[lkml]   [2022]   [May]   [13]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
    Patch in this message
    /
    From
    Subject[PATCH 5.10 03/10] block: drbd: drbd_nl: Make conversion to enum drbd_ret_code explicit
    Date
    From: Lee Jones <lee.jones@linaro.org>

    commit 1f1e87b4dc4598eac57a69868534b92d65e47e82 upstream.

    Fixes the following W=1 kernel build warning(s):

    from drivers/block/drbd/drbd_nl.c:24:
    drivers/block/drbd/drbd_nl.c: In function ‘drbd_adm_set_role’:
    drivers/block/drbd/drbd_nl.c:793:11: warning: implicit conversion from ‘enum drbd_state_rv’ to ‘enum drbd_ret_code’ [-Wenum-conversion]
    drivers/block/drbd/drbd_nl.c:795:11: warning: implicit conversion from ‘enum drbd_state_rv’ to ‘enum drbd_ret_code’ [-Wenum-conversion]
    drivers/block/drbd/drbd_nl.c: In function ‘drbd_adm_attach’:
    drivers/block/drbd/drbd_nl.c:1965:10: warning: implicit conversion from ‘enum drbd_state_rv’ to ‘enum drbd_ret_code’ [-Wenum-conversion]
    drivers/block/drbd/drbd_nl.c: In function ‘drbd_adm_connect’:
    drivers/block/drbd/drbd_nl.c:2690:10: warning: implicit conversion from ‘enum drbd_state_rv’ to ‘enum drbd_ret_code’ [-Wenum-conversion]
    drivers/block/drbd/drbd_nl.c: In function ‘drbd_adm_disconnect’:
    drivers/block/drbd/drbd_nl.c:2803:11: warning: implicit conversion from ‘enum drbd_state_rv’ to ‘enum drbd_ret_code’ [-Wenum-conversion]

    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>
    Link: https://lore.kernel.org/r/20210312105530.2219008-8-lee.jones@linaro.org
    Signed-off-by: Jens Axboe <axboe@kernel.dk>
    Cc: Nathan Chancellor <nathan@kernel.org>
    Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
    ---
    drivers/block/drbd/drbd_nl.c | 13 ++++++++-----
    1 file changed, 8 insertions(+), 5 deletions(-)

    --- a/drivers/block/drbd/drbd_nl.c
    +++ b/drivers/block/drbd/drbd_nl.c
    @@ -790,9 +790,11 @@ int drbd_adm_set_role(struct sk_buff *sk
    mutex_lock(&adm_ctx.resource->adm_mutex);

    if (info->genlhdr->cmd == DRBD_ADM_PRIMARY)
    - retcode = drbd_set_role(adm_ctx.device, R_PRIMARY, parms.assume_uptodate);
    + retcode = (enum drbd_ret_code)drbd_set_role(adm_ctx.device,
    + R_PRIMARY, parms.assume_uptodate);
    else
    - retcode = drbd_set_role(adm_ctx.device, R_SECONDARY, 0);
    + retcode = (enum drbd_ret_code)drbd_set_role(adm_ctx.device,
    + R_SECONDARY, 0);

    mutex_unlock(&adm_ctx.resource->adm_mutex);
    genl_lock();
    @@ -1962,7 +1964,7 @@ int drbd_adm_attach(struct sk_buff *skb,
    drbd_flush_workqueue(&connection->sender_work);

    rv = _drbd_request_state(device, NS(disk, D_ATTACHING), CS_VERBOSE);
    - retcode = rv; /* FIXME: Type mismatch. */
    + retcode = (enum drbd_ret_code)rv;
    drbd_resume_io(device);
    if (rv < SS_SUCCESS)
    goto fail;
    @@ -2687,7 +2689,8 @@ int drbd_adm_connect(struct sk_buff *skb
    }
    rcu_read_unlock();

    - retcode = conn_request_state(connection, NS(conn, C_UNCONNECTED), CS_VERBOSE);
    + retcode = (enum drbd_ret_code)conn_request_state(connection,
    + NS(conn, C_UNCONNECTED), CS_VERBOSE);

    conn_reconfig_done(connection);
    mutex_unlock(&adm_ctx.resource->adm_mutex);
    @@ -2800,7 +2803,7 @@ int drbd_adm_disconnect(struct sk_buff *
    mutex_lock(&adm_ctx.resource->adm_mutex);
    rv = conn_try_disconnect(connection, parms.force_disconnect);
    if (rv < SS_SUCCESS)
    - retcode = rv; /* FIXME: Type mismatch. */
    + retcode = (enum drbd_ret_code)rv;
    else
    retcode = NO_ERROR;
    mutex_unlock(&adm_ctx.resource->adm_mutex);

    \
     
     \ /
      Last update: 2022-05-13 16:32    [W:3.061 / U:0.028 seconds]
    ©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site