[PATCH BlueZ] mesh: Skip unneeded logs

[PATCH BlueZ] mesh: Skip unneeded logs

[Michał Lowas-Rzechonek]

---
 mesh/keyring.c | 2 +-
 mesh/rpl.c     | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/mesh/keyring.c b/mesh/keyring.c
index b44091154..d81e5e412 100644
--- a/mesh/keyring.c
+++ b/mesh/keyring.c
@@ -207,7 +207,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,
 
 	snprintf(key_file, PATH_MAX, "%s%s", node_path, dev_key_dir);
 
-	if (mkdir(key_file, 0755) != 0)
+	if (mkdir(key_file, 0755) != 0 && errno != EEXIST)
 		l_error("Failed to create dir(%d): %s", errno, key_file);
 
 	for (i = 0; i < count; i++) {
diff --git a/mesh/rpl.c b/mesh/rpl.c
index 6bb3532b2..1213ee66e 100644
--- a/mesh/rpl.c
+++ b/mesh/rpl.c
@@ -80,7 +80,7 @@ bool rpl_put_entry(struct mesh_node *node, uint16_t src, uint32_t iv_index,
 	iv_index--;
 	snprintf(src_file, PATH_MAX, "%s%s/%8.8x/%4.4x", node_path, rpl_dir,
 								iv_index, src);
-	if (remove(src_file) < 0)
+	if (remove(src_file) < 0 && errno != ENOENT)
 		l_error("Failed to remove(%d): %s", errno, src_file);
 
 	return result;
-- 
2.25.1

RE: [BlueZ] mesh: Skip unneeded logs

[bluez.test.bot]

[-- Attachment #1: Type: text/plain, Size: 997 bytes --]

This is automated email and please do not reply to this email!

Dear submitter,

Thank you for submitting the patches to the linux bluetooth mailing list.
This is a CI test results with your patch series:
PW Link:https://patchwork.kernel.org/project/bluetooth/list/?series=611026

---Test result---

Test Summary:
CheckPatch                    PASS      1.47 seconds
GitLint                       PASS      1.08 seconds
Prep - Setup ELL              PASS      55.08 seconds
Build - Prep                  PASS      0.87 seconds
Build - Configure             PASS      10.89 seconds
Build - Make                  PASS      1945.03 seconds
Make Check                    PASS      13.23 seconds
Make Check w/Valgrind         PASS      575.62 seconds
Make Distcheck                PASS      306.57 seconds
Build w/ext ELL - Configure   PASS      11.14 seconds
Build w/ext ELL - Make        PASS      1926.99 seconds
Incremental Build with patchesPASS      0.00 seconds



---
Regards,
Linux Bluetooth

Re: [PATCH BlueZ] mesh: Skip unneeded logs

[Gix, Brian]

Applied

On Thu, 2022-02-03 at 15:38 +0100, Michał Lowas-Rzechonek wrote:
> ---
>  mesh/keyring.c | 2 +-
>  mesh/rpl.c     | 2 +-
>  2 files changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/mesh/keyring.c b/mesh/keyring.c
> index b44091154..d81e5e412 100644
> --- a/mesh/keyring.c
> +++ b/mesh/keyring.c
> @@ -207,7 +207,7 @@ bool keyring_put_remote_dev_key(struct mesh_node *node, uint16_t unicast,
>  
>         snprintf(key_file, PATH_MAX, "%s%s", node_path, dev_key_dir);
>  
> -       if (mkdir(key_file, 0755) != 0)
> +       if (mkdir(key_file, 0755) != 0 && errno != EEXIST)
>                 l_error("Failed to create dir(%d): %s", errno, key_file);
>  
>         for (i = 0; i < count; i++) {
> diff --git a/mesh/rpl.c b/mesh/rpl.c
> index 6bb3532b2..1213ee66e 100644
> --- a/mesh/rpl.c
> +++ b/mesh/rpl.c
> @@ -80,7 +80,7 @@ bool rpl_put_entry(struct mesh_node *node, uint16_t src, uint32_t iv_index,
>         iv_index--;
>         snprintf(src_file, PATH_MAX, "%s%s/%8.8x/%4.4x", node_path, rpl_dir,
>                                                                 iv_index, src);
> -       if (remove(src_file) < 0)
> +       if (remove(src_file) < 0 && errno != ENOENT)
>                 l_error("Failed to remove(%d): %s", errno, src_file);
>  
>         return result;