pa-fazil
/
android_system_core
mirror of https://github.com/fazilsheik96/android_system_core.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge "adds LO_FLAGS_AUTOCLEAR for loop device of zram backing device"

This commit is contained in:
David Anderson 2021-10-07 15:49:18 +00:00 committed by Gerrit Code Review
parent 2e1e76b8ff d884ba5916
commit af09c15049
3 changed files with 16 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
fs_mgr/fs_mgr.cpp
View File

@ -2119,6 +2119,9 @@ static bool PrepareZramBackingDevice(off64_t size) {
PERROR << "Cannot open " << loop_device; PERROR << "Cannot open " << loop_device;
return false; return false;
} }
if (!LoopControl::SetAutoClearStatus(loop_fd.get())) {
PERROR << "Failed set LO_FLAGS_AUTOCLEAR for " << loop_device;
}
if (!LoopControl::EnableDirectIo(loop_fd.get())) { if (!LoopControl::EnableDirectIo(loop_fd.get())) {
return false; return false;
} }

3
fs_mgr/libdm/include/libdm/loop_control.h
View File

@ -46,6 +46,9 @@ class LoopControl final {
// Enable Direct I/O on a loop device. This requires kernel 4.9+. // Enable Direct I/O on a loop device. This requires kernel 4.9+.
static bool EnableDirectIo(int fd); static bool EnableDirectIo(int fd);
// Set LO_FLAGS_AUTOCLEAR on a loop device.
static bool SetAutoClearStatus(int fd);
LoopControl(const LoopControl&) = delete; LoopControl(const LoopControl&) = delete;
LoopControl& operator=(const LoopControl&) = delete; LoopControl& operator=(const LoopControl&) = delete;
LoopControl& operator=(LoopControl&&) = default; LoopControl& operator=(LoopControl&&) = default;

10
fs_mgr/libdm/loop_control.cpp
View File

@ -133,6 +133,16 @@ bool LoopControl::EnableDirectIo(int fd) {
return true; return true;
} }
bool LoopControl::SetAutoClearStatus(int fd) {
struct loop_info64 info = {};
info.lo_flags |= LO_FLAGS_AUTOCLEAR;
if (ioctl(fd, LOOP_SET_STATUS64, &info)) {
return false;
}
return true;
}
LoopDevice::LoopDevice(android::base::borrowed_fd fd, const std::chrono::milliseconds& timeout_ms, LoopDevice::LoopDevice(android::base::borrowed_fd fd, const std::chrono::milliseconds& timeout_ms,
bool auto_close) bool auto_close)
: fd_(fd), owned_fd_(-1) { : fd_(fd), owned_fd_(-1) {