!161 pool: do not pass empty string in callback

From: @yanyan11222 
Reviewed-by: @swf504 
Signed-off-by: @swf504

0018-do-not-pass-empty-string-in-callback.patch

@@ -0,0 +1,29 @@
+From e022805f1d908cd9da8701db99a8e8ffd97c5519 Mon Sep 17 00:00:00 2001
+From: Zdenek Kabelac <zkabelac@redhat.com>
+Date: Tue, 4 Jul 2023 22:46:50 +0200
+Subject: [PATCH] pool: do not pass empty string in callback
+
+When preparing cmdline to executing dmpd tool, avoid adding
+empty string ("") on such line.
+
+---
+ lib/activate/dev_manager.c | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git a/lib/activate/dev_manager.c b/lib/activate/dev_manager.c
+index 07d5873..469d71f 100644
+--- a/lib/activate/dev_manager.c
++++ b/lib/activate/dev_manager.c
+@@ -2529,7 +2529,8 @@ static int _pool_callback(struct dm_tree_node *node,
+ 				  data->global);
+ 			return 0;
+ 		}
+-		argv[++args] = cv->v.str;
++		if (cv->v.str[0])
++			argv[++args] = cv->v.str;
+ 	}
+ 
+ 	if (args == 16) {
+-- 
+2.27.0
+

lvm2.spec

@@ -43,7 +43,7 @@
 
 Name:      lvm2
 Version:   2.03.21
-Release:   7
+Release:   8
 Epoch:     8
 Summary:   Tools for logical volume management
 License:   GPLv2+ and LGPLv2.1 and BSD
@@ -66,6 +66,7 @@ Patch14:   0014-use-sync-io-read-bcache-by-defaults.patch
 Patch15:   0015-vgchange-acquire-an-exclusive-VG-lock-for-refresh.patch
 Patch16:   0016-dm-event-release-buffer-on-dm_event_get_version.patch
 Patch17:   0017-clean-up-group-struct-in-_stats_create_group-error-path.patch
+Patch18:   0018-do-not-pass-empty-string-in-callback.patch
 
 BuildRequires: gcc
 BuildRequires: gcc-c++
@@ -492,6 +493,9 @@ fi
 
 
 %changelog
+* Tue May 7 2024 yanshuai <yanshuai@kylinos.cn> - 8:2.03.21-8
+- pool: do not pass empty string in callback
+
 * Thu Mar 21 2024 wangzhiqiang <wangzhiqiang95@huawei.com> - 8:2.03.21-7
 - backport upstream patch