[dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error

[Martin Wilck]

On Wed, 2022-01-05 at 22:30 +0000, Sergei Trofimovich wrote:
> On gcc-12 build failed as:
> 
>     devmapper.c: In function 'dm_simplecmd':
>     devmapper.c:61:13: error: unused variable 'udev_wait_flag' [-
> Werror=unused-variable]
>        61 |         int udev_wait_flag = (task == DM_DEVICE_RESUME ||
>           |             ^~~~~~~~~~~~~~
> 
> Fix error by hiding it's declaration under #ifdef that uses it.
> CC: Martin Wilck <mwilck at suse.com>
> CC: Benjamin Marzinski <bmarzins at redhat.com>
> ---
>  kpartx/devmapper.c | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)

Under https://github.com/opensvc/multipath-tools/pull/23/files
you posted a different patch, containing additional changes.

Are you saying this alone fixes your issue?

Martin


> 
> diff --git a/kpartx/devmapper.c b/kpartx/devmapper.c
> index 3efd6dfc..511c090f 100644
> --- a/kpartx/devmapper.c
> +++ b/kpartx/devmapper.c
> @@ -58,9 +58,9 @@ out:
>  int dm_simplecmd(int task, const char *name, int no_flush, uint16_t
> udev_flags)
>  {
>         int r = 0;
> +#ifdef LIBDM_API_COOKIE
>         int udev_wait_flag = (task == DM_DEVICE_RESUME ||
>                               task == DM_DEVICE_REMOVE);
> -#ifdef LIBDM_API_COOKIE
>         uint32_t cookie = 0;
>  #endif
>         struct dm_task *dmt;