From 49dd03d3679c13e8788d6d2b8baaeb71b0a22589 Mon Sep 17 00:00:00 2001 From: sunxiaoqiang Date: Tue, 27 Aug 2024 12:17:00 +0000 Subject: [PATCH 1/3] update services/storage_daemon/disk/src/disk_info.cpp. Signed-off-by: sunxiaoqiang --- services/storage_daemon/disk/src/disk_info.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/services/storage_daemon/disk/src/disk_info.cpp b/services/storage_daemon/disk/src/disk_info.cpp index af83bde3..44a3bdd6 100644 --- a/services/storage_daemon/disk/src/disk_info.cpp +++ b/services/storage_daemon/disk/src/disk_info.cpp @@ -125,6 +125,7 @@ int DiskInfo::Destroy() return E_ERR; } } + status = sDestroy; volumeId_.clear(); return E_OK; -- Gitee From 2701fcb8d1f51b682d5ce7ce7201911ee5bb2f64 Mon Sep 17 00:00:00 2001 From: sunxiaoqiang Date: Wed, 28 Aug 2024 04:03:35 +0000 Subject: [PATCH 2/3] update services/storage_daemon/netlink/src/netlink_listener.cpp. Signed-off-by: sunxiaoqiang --- services/storage_daemon/netlink/src/netlink_listener.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/storage_daemon/netlink/src/netlink_listener.cpp b/services/storage_daemon/netlink/src/netlink_listener.cpp index 8553bc19..003367fb 100644 --- a/services/storage_daemon/netlink/src/netlink_listener.cpp +++ b/services/storage_daemon/netlink/src/netlink_listener.cpp @@ -127,9 +127,9 @@ void NetlinkListener::RunListener() { struct pollfd ufds[2]; int32_t idleTime = POLL_IDLE_TIME; + while (1) { int32_t fdCount = 0; - ufds[fdCount].fd = socketPipe_[0]; ufds[fdCount].events = POLLIN; ufds[fdCount].revents = 0; @@ -148,7 +148,7 @@ void NetlinkListener::RunListener() continue; } break; - } else if (fdEventCount >= 0) { + } else if (fdEventCount == 0) { continue; } -- Gitee From 0dee4a58f53d8c2ae82ea35fb6795ca1d7d9cb5a Mon Sep 17 00:00:00 2001 From: sunxiaoqiang Date: Wed, 28 Aug 2024 06:52:14 +0000 Subject: [PATCH 3/3] update services/storage_daemon/disk/src/disk_info.cpp. Signed-off-by: sunxiaoqiang --- services/storage_daemon/disk/src/disk_info.cpp | 1 - 1 file changed, 1 deletion(-) diff --git a/services/storage_daemon/disk/src/disk_info.cpp b/services/storage_daemon/disk/src/disk_info.cpp index 44a3bdd6..af83bde3 100644 --- a/services/storage_daemon/disk/src/disk_info.cpp +++ b/services/storage_daemon/disk/src/disk_info.cpp @@ -125,7 +125,6 @@ int DiskInfo::Destroy() return E_ERR; } } - status = sDestroy; volumeId_.clear(); return E_OK; -- Gitee