openkylin
/
platform_system_core
mirror of https://gitee.com/openkylin/platform_system_core.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge "libdm: remove libbase dependency in header."

This commit is contained in:
Treehugger Robot 2018-08-22 15:30:43 +00:00 committed by Gerrit Code Review
parent 6d2ace3684 d449e2e59f
commit 56d079b40a
4 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
fs_mgr/libdm/dm.cpp
View File

@ -20,11 +20,19 @@
#include <sys/sysmacros.h>
#include <sys/types.h>
#include <android-base/logging.h>
#include <android-base/macros.h>
namespace android {
namespace dm {
DeviceMapper::DeviceMapper() : fd_(-1) {
fd_ = TEMP_FAILURE_RETRY(open("/dev/device-mapper", O_RDWR | O_CLOEXEC));
if (fd_ < 0) {
PLOG(ERROR) << "Failed to open device-mapper";
}
}
DeviceMapper& DeviceMapper::Instance() {
static DeviceMapper instance;
return instance;

9
fs_mgr/libdm/include/libdm/dm.h
View File

@ -29,8 +29,6 @@
#include <utility>
#include <vector>
#include <android-base/logging.h>
#include "dm_table.h"
// The minimum expected device mapper major.minor version
@ -144,12 +142,7 @@ class DeviceMapper final {
void InitIo(struct dm_ioctl* io, const std::string& name = std::string()) const;
DeviceMapper() : fd_(-1) {
fd_ = TEMP_FAILURE_RETRY(open("/dev/device-mapper", O_RDWR | O_CLOEXEC));
if (fd_ < 0) {
PLOG(ERROR) << "Failed to open device-mapper";
}
}
DeviceMapper();
// Creates a device mapper device with given name.
// Return 'true' on success and 'false' on failure to

2
fs_mgr/libdm/include/libdm/dm_target.h
View File

@ -23,8 +23,6 @@
#include <string>
#include <vector>
#include <android-base/logging.h>
namespace android {
namespace dm {

1
fs_mgr/tools/dmctl.cpp
View File

@ -22,6 +22,7 @@
#include <sys/types.h>
#include <unistd.h>
#include <android-base/logging.h>
#include <android-base/parseint.h>
#include <android-base/unique_fd.h>
#include <libdm/dm.h>