Loading health/storage/1.0/default/Storage.cpp +9 −16 Original line number Original line Diff line number Diff line Loading @@ -36,27 +36,20 @@ using base::Timer; using base::Trim; using base::Trim; using base::WriteStringToFd; using base::WriteStringToFd; using base::WriteStringToFile; using base::WriteStringToFile; using fs_mgr::Fstab; using fs_mgr::ReadDefaultFstab; std::string getGarbageCollectPath() { std::string getGarbageCollectPath() { std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(), Fstab fstab; fs_mgr_free_fstab); ReadDefaultFstab(&fstab); struct fstab_rec* rec = NULL; for (int i = 0; i < fstab->num_entries; i++) { for (const auto& entry : fstab) { if (fs_mgr_has_sysfs_path(&fstab->recs[i])) { if (!entry.sysfs_path.empty()) { rec = &fstab->recs[i]; return entry.sysfs_path + "/manual_gc"; break; } } } if (!rec) { return ""; } } std::string path; return ""; path.append(rec->sysfs_path); path = path + "/manual_gc"; return path; } } Return<void> Storage::garbageCollect(uint64_t timeoutSeconds, Return<void> Storage::garbageCollect(uint64_t timeoutSeconds, Loading Loading
health/storage/1.0/default/Storage.cpp +9 −16 Original line number Original line Diff line number Diff line Loading @@ -36,27 +36,20 @@ using base::Timer; using base::Trim; using base::Trim; using base::WriteStringToFd; using base::WriteStringToFd; using base::WriteStringToFile; using base::WriteStringToFile; using fs_mgr::Fstab; using fs_mgr::ReadDefaultFstab; std::string getGarbageCollectPath() { std::string getGarbageCollectPath() { std::unique_ptr<fstab, decltype(&fs_mgr_free_fstab)> fstab(fs_mgr_read_fstab_default(), Fstab fstab; fs_mgr_free_fstab); ReadDefaultFstab(&fstab); struct fstab_rec* rec = NULL; for (int i = 0; i < fstab->num_entries; i++) { for (const auto& entry : fstab) { if (fs_mgr_has_sysfs_path(&fstab->recs[i])) { if (!entry.sysfs_path.empty()) { rec = &fstab->recs[i]; return entry.sysfs_path + "/manual_gc"; break; } } } if (!rec) { return ""; } } std::string path; return ""; path.append(rec->sysfs_path); path = path + "/manual_gc"; return path; } } Return<void> Storage::garbageCollect(uint64_t timeoutSeconds, Return<void> Storage::garbageCollect(uint64_t timeoutSeconds, Loading