tequilaOS/platform_system_vold
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge "Use snapshot value sys.fuse_snapshot instead of persist.sys.fuse"

Browse source
This commit is contained in:
TreeHugger Robot 2019-09-27 16:09:33 +00:00 committed by Android (Google) Code Review
commit de735e608b
4 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Utils.h
View file

@ -34,7 +34,7 @@ struct DIR;
namespace android {
namespace vold {
static const char* kPropFuse = "persist.sys.fuse";
static const char* kPropFuseSnapshot = "sys.fuse_snapshot";
/* SELinux contexts used depending on the block device type */
extern security_context_t sBlkidContext;

4
VolumeManager.cpp
View file

@ -382,7 +382,7 @@ int VolumeManager::forgetPartition(const std::string& partGuid, const std::strin
}
int VolumeManager::linkPrimary(userid_t userId) {
bool isFuse = GetBoolProperty(android::vold::kPropFuse, false);
bool isFuse = GetBoolProperty(android::vold::kPropFuseSnapshot, false);
if (isFuse) {
// Here we have to touch /mnt/user/userid>/<volumeid> which was already mounted as part of
@ -464,7 +464,7 @@ int VolumeManager::setPrimary(const std::shared_ptr<android::vold::VolumeBase>&
}
int VolumeManager::remountUid(uid_t uid, int32_t mountMode) {
if (GetBoolProperty(android::vold::kPropFuse, false)) {
if (GetBoolProperty(android::vold::kPropFuseSnapshot, false)) {
// TODO(135341433): Implement fuse specific logic.
return 0;
}

4
model/EmulatedVolume.cpp
View file

@ -84,7 +84,7 @@ status_t EmulatedVolume::doMount() {
dev_t before = GetDevice(mFuseFull);
bool isFuse = base::GetBoolProperty(kPropFuse, false);
bool isFuse = base::GetBoolProperty(kPropFuseSnapshot, false);
if (isFuse) {
LOG(INFO) << "Mounting emulated fuse volume";
@ -155,7 +155,7 @@ status_t EmulatedVolume::doUnmount() {
// error code and might cause broken behaviour in applications.
KillProcessesUsingPath(getPath());
bool isFuse = base::GetBoolProperty(kPropFuse, false);
bool isFuse = base::GetBoolProperty(kPropFuseSnapshot, false);
if (isFuse) {
// We could have migrated storage to an adopted private volume, so always
// call primary storage "emulated" to avoid media rescans.

4
model/PublicVolume.cpp
View file

@ -169,7 +169,7 @@ status_t PublicVolume::doMount() {
dev_t before = GetDevice(mFuseFull);
bool isFuse = base::GetBoolProperty(kPropFuse, false);
bool isFuse = base::GetBoolProperty(kPropFuseSnapshot, false);
if (isFuse) {
LOG(INFO) << "Mounting public fuse volume";
@ -250,7 +250,7 @@ status_t PublicVolume::doUnmount() {
// error code and might cause broken behaviour in applications.
KillProcessesUsingPath(getPath());
bool isFuse = base::GetBoolProperty(kPropFuse, false);
bool isFuse = base::GetBoolProperty(kPropFuseSnapshot, false);
if (isFuse) {
// Use UUID as stable name, if available
std::string stableName = getId();