[dpdk-stable] patch 'examples/vhost_blk: fix check of device path' has been queued to stable release 19.11.1

[luca.boccassi at gmail.com]

Hi,

FYI, your patch has been queued to stable release 19.11.1

Note it hasn't been pushed to http://dpdk.org/browse/dpdk-stable yet.
It will be pushed if I get no objections before 02/19/20. So please
shout if anyone has objections.

Also note that after the patch there's a diff of the upstream commit vs the
patch applied to the branch. This will indicate if there was any rebasing
needed to apply to the stable branch. If there were code changes for rebasing
(ie: not only metadata diffs), please double check that the rebase was
correctly done.

Thanks.

Luca Boccassi

---
>From e879627a3b3a5f2d90e2a0917bb3a61315090d5a Mon Sep 17 00:00:00 2001
From: Jin Yu <jin.yu at intel.com>
Date: Wed, 12 Feb 2020 20:54:46 +0800
Subject: [PATCH] examples/vhost_blk: fix check of device path

[ upstream commit 71dd2870bf79930ac388b50d70fc319dd200e604 ]

Fix the time of check time of use warning in example code.
Ignore the errno of unlink failure. There are two situations.
The first one is that file doesn't exist the unlink fails and
it's ok to ignore. The second one is that unlink fails to remove
file but the next bind() would fail too.

Coverity issue: 350589, 158663
Fixes: c19beb3f38cd ("examples/vhost_blk: introduce vhost storage sample")

Signed-off-by: Jin Yu <jin.yu at intel.com>
Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>
---
 examples/vhost_blk/vhost_blk.c | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

diff --git a/examples/vhost_blk/vhost_blk.c b/examples/vhost_blk/vhost_blk.c
index e1036bf3a6..74c82a900b 100644
--- a/examples/vhost_blk/vhost_blk.c
+++ b/examples/vhost_blk/vhost_blk.c
@@ -994,11 +994,7 @@ vhost_blk_ctrlr_construct(const char *ctrlr_name)
 	}
 	snprintf(dev_pathname, sizeof(dev_pathname), "%s/%s", path, ctrlr_name);
 
-	if (access(dev_pathname, F_OK) != -1) {
-		if (unlink(dev_pathname) != 0)
-			rte_exit(EXIT_FAILURE, "Cannot remove %s.\n",
-				 dev_pathname);
-	}
+	unlink(dev_pathname);
 
 	if (rte_vhost_driver_register(dev_pathname, 0) != 0) {
 		fprintf(stderr, "socket %s already exists\n", dev_pathname);
@@ -1041,8 +1037,7 @@ signal_handler(__rte_unused int signum)
 {
 	struct vhost_blk_ctrlr *ctrlr;
 
-	if (access(dev_pathname, F_OK) == 0)
-		unlink(dev_pathname);
+	unlink(dev_pathname);
 
 	if (g_should_stop != -1) {
 		g_should_stop = 1;
-- 
2.20.1

---
  Diff of the applied patch vs upstream commit (please double-check if non-empty:
---
--- -	2020-02-17 17:00:16.456848275 +0000
+++ 0041-examples-vhost_blk-fix-check-of-device-path.patch	2020-02-17 17:00:15.359951192 +0000
@@ -1,8 +1,10 @@
-From 71dd2870bf79930ac388b50d70fc319dd200e604 Mon Sep 17 00:00:00 2001
+From e879627a3b3a5f2d90e2a0917bb3a61315090d5a Mon Sep 17 00:00:00 2001
 From: Jin Yu <jin.yu at intel.com>
 Date: Wed, 12 Feb 2020 20:54:46 +0800
 Subject: [PATCH] examples/vhost_blk: fix check of device path
 
+[ upstream commit 71dd2870bf79930ac388b50d70fc319dd200e604 ]
+
 Fix the time of check time of use warning in example code.
 Ignore the errno of unlink failure. There are two situations.
 The first one is that file doesn't exist the unlink fails and
@@ -11,7 +13,6 @@
 
 Coverity issue: 350589, 158663
 Fixes: c19beb3f38cd ("examples/vhost_blk: introduce vhost storage sample")
-Cc: stable at dpdk.org
 
 Signed-off-by: Jin Yu <jin.yu at intel.com>
 Reviewed-by: Maxime Coquelin <maxime.coquelin at redhat.com>