* [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error
@ 2022-01-05 22:30 Sergei Trofimovich
2022-01-06 10:55 ` Martin Wilck
2022-01-06 11:00 ` [dm-devel] [PATCH] " Martin Wilck
0 siblings, 2 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2022-01-05 22:30 UTC (permalink / raw)
To: dm-devel; +Cc: Sergei Trofimovich, Martin Wilck
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@suse.com>
CC: Benjamin Marzinski <bmarzins@redhat.com>
---
kpartx/devmapper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.34.1
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error
2022-01-05 22:30 [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error Sergei Trofimovich
@ 2022-01-06 10:55 ` Martin Wilck
2022-01-06 10:58 ` Martin Wilck
2022-01-06 11:00 ` [dm-devel] [PATCH] " Martin Wilck
1 sibling, 1 reply; 7+ messages in thread
From: Martin Wilck @ 2022-01-06 10:55 UTC (permalink / raw)
To: Sergei Trofimovich, dm-devel
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@suse.com>
> CC: Benjamin Marzinski <bmarzins@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;
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error
2022-01-06 10:55 ` Martin Wilck
@ 2022-01-06 10:58 ` Martin Wilck
2022-01-09 9:28 ` [dm-devel] [PATCH v2 1/2] " Sergei Trofimovich
0 siblings, 1 reply; 7+ messages in thread
From: Martin Wilck @ 2022-01-06 10:58 UTC (permalink / raw)
To: Sergei Trofimovich, dm-devel
On Thu, 2022-01-06 at 11:55 +0100, Martin Wilck wrote:
> 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@suse.com>
> > CC: Benjamin Marzinski <bmarzins@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?
Sorry, I overlooked your second patch.
Next time, please send a series.
Regards
Martin
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error
2022-01-05 22:30 [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error Sergei Trofimovich
2022-01-06 10:55 ` Martin Wilck
@ 2022-01-06 11:00 ` Martin Wilck
1 sibling, 0 replies; 7+ messages in thread
From: Martin Wilck @ 2022-01-06 11:00 UTC (permalink / raw)
To: Sergei Trofimovich, dm-devel
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@suse.com>
> CC: Benjamin Marzinski <bmarzins@redhat.com>
Please add a Signed-off-by: line. Same for the other patch.
Apart from that, both patches are ok.
Martin
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
* [dm-devel] [PATCH v2 1/2] kpartx/devmapper.c: fix unused-but-set variable error
2022-01-06 10:58 ` Martin Wilck
@ 2022-01-09 9:28 ` Sergei Trofimovich
2022-01-09 9:28 ` [dm-devel] [PATCH v2 2/2] kpartx/devmapper.c: fix unused " Sergei Trofimovich
2022-01-10 16:57 ` [dm-devel] [PATCH v2 1/2] kpartx/devmapper.c: fix unused-but-set " Martin Wilck
0 siblings, 2 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2022-01-09 9:28 UTC (permalink / raw)
To: dm-devel; +Cc: Sergei Trofimovich, Martin Wilck
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@suse.com>
CC: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
---
kpartx/devmapper.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
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;
--
2.34.1
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [dm-devel] [PATCH v2 2/2] kpartx/devmapper.c: fix unused variable error
2022-01-09 9:28 ` [dm-devel] [PATCH v2 1/2] " Sergei Trofimovich
@ 2022-01-09 9:28 ` Sergei Trofimovich
2022-01-10 16:57 ` [dm-devel] [PATCH v2 1/2] kpartx/devmapper.c: fix unused-but-set " Martin Wilck
1 sibling, 0 replies; 7+ messages in thread
From: Sergei Trofimovich @ 2022-01-09 9:28 UTC (permalink / raw)
To: dm-devel; +Cc: Sergei Trofimovich, Martin Wilck
Without the change the build fails as:
devmapper.c:58:69: error: unused parameter 'udev_flags' [-Werror=unused-parameter]
58 | int dm_simplecmd(int task, const char *name, int no_flush, uint16_t udev_flags)
| ~~~~~~~~~^~~~~~~~~~
The change adds __attribute__((used)) annotation to unused function parameter.
CC: Martin Wilck <mwilck@suse.com>
CC: Benjamin Marzinski <bmarzins@redhat.com>
Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
---
kpartx/devmapper.c | 8 +++++++-
1 file changed, 7 insertions(+), 1 deletion(-)
diff --git a/kpartx/devmapper.c b/kpartx/devmapper.c
index 511c090f..49ffd310 100644
--- a/kpartx/devmapper.c
+++ b/kpartx/devmapper.c
@@ -18,6 +18,12 @@
#define MAX_PREFIX_LEN (_UUID_PREFIX_LEN + 4)
#define PARAMS_SIZE 1024
+#ifdef LIBDM_API_COOKIE
+# define __DM_API_COOKIE_UNUSED__ /* empty */
+#else
+# define __DM_API_COOKIE_UNUSED__ __attribute__((unused))
+#endif
+
int dm_prereq(char * str, uint32_t x, uint32_t y, uint32_t z)
{
int r = 1;
@@ -55,7 +61,7 @@ out:
return r;
}
-int dm_simplecmd(int task, const char *name, int no_flush, uint16_t udev_flags)
+int dm_simplecmd(int task, const char *name, int no_flush, __DM_API_COOKIE_UNUSED__ uint16_t udev_flags)
{
int r = 0;
#ifdef LIBDM_API_COOKIE
--
2.34.1
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [dm-devel] [PATCH v2 1/2] kpartx/devmapper.c: fix unused-but-set variable error
2022-01-09 9:28 ` [dm-devel] [PATCH v2 1/2] " Sergei Trofimovich
2022-01-09 9:28 ` [dm-devel] [PATCH v2 2/2] kpartx/devmapper.c: fix unused " Sergei Trofimovich
@ 2022-01-10 16:57 ` Martin Wilck
1 sibling, 0 replies; 7+ messages in thread
From: Martin Wilck @ 2022-01-10 16:57 UTC (permalink / raw)
To: Sergei Trofimovich, dm-devel
On Sun, 2022-01-09 at 09:28 +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@suse.com>
> CC: Benjamin Marzinski <bmarzins@redhat.com>
> Signed-off-by: Sergei Trofimovich <slyich@gmail.com>
For this series:
Reviewed-by: Martin Wilck <mwilck@suse.com>
--
dm-devel mailing list
dm-devel@redhat.com
https://listman.redhat.com/mailman/listinfo/dm-devel
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2022-01-10 16:58 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2022-01-05 22:30 [dm-devel] [PATCH] kpartx/devmapper.c: fix unused-but-set variable error Sergei Trofimovich
2022-01-06 10:55 ` Martin Wilck
2022-01-06 10:58 ` Martin Wilck
2022-01-09 9:28 ` [dm-devel] [PATCH v2 1/2] " Sergei Trofimovich
2022-01-09 9:28 ` [dm-devel] [PATCH v2 2/2] kpartx/devmapper.c: fix unused " Sergei Trofimovich
2022-01-10 16:57 ` [dm-devel] [PATCH v2 1/2] kpartx/devmapper.c: fix unused-but-set " Martin Wilck
2022-01-06 11:00 ` [dm-devel] [PATCH] " Martin Wilck
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.