gugelfrei
/
android_system_vold
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge "Add disk for StubVolume"

Browse Source
gugelfrei
TreeHugger Robot 4 years ago committed by Android (Google) Code Review
parent 50f7de29be 82e90de23d
commit dd85fe2e5e
9 changed files with 65 additions and 39 deletions
Show Stats Download Patch File Download Diff File

13
VoldNativeService.cpp
Unescape View File

@ -486,9 +486,12 @@ binder::Status VoldNativeService::destroyObb(const std::string& volId) {
return translate(VolumeManager::Instance()->destroyObb(volId));
}
binder::Status VoldNativeService::createStubVolume(
const std::string& sourcePath, const std::string& mountPath, const std::string& fsType,
const std::string& fsUuid, const std::string& fsLabel, std::string* _aidl_return) {
binder::Status VoldNativeService::createStubVolume(const std::string& sourcePath,
const std::string& mountPath,
const std::string& fsType,
const std::string& fsUuid,
const std::string& fsLabel, int32_t flags,
std::string* _aidl_return) {
ENFORCE_SYSTEM_OR_ROOT;
CHECK_ARGUMENT_PATH(sourcePath);
CHECK_ARGUMENT_PATH(mountPath);
@ -497,8 +500,8 @@ binder::Status VoldNativeService::createStubVolume(
// is quite meaningless.
ACQUIRE_LOCK;
return translate(VolumeManager::Instance()->createStubVolume(sourcePath, mountPath, fsType,
fsUuid, fsLabel, _aidl_return));
return translate(VolumeManager::Instance()->createStubVolume(
sourcePath, mountPath, fsType, fsUuid, fsLabel, flags, _aidl_return));
}
binder::Status VoldNativeService::destroyStubVolume(const std::string& volId) {

3
VoldNativeService.h
Unescape View File

@ -73,7 +73,8 @@ class VoldNativeService : public BinderService<VoldNativeService>, public os::Bn
binder::Status createStubVolume(const std::string& sourcePath, const std::string& mountPath,
const std::string& fsType, const std::string& fsUuid,
const std::string& fsLabel, std::string* _aidl_return);
const std::string& fsLabel, int32_t flags,
std::string* _aidl_return);
binder::Status destroyStubVolume(const std::string& volId);
binder::Status fstrim(int32_t fstrimFlags,

46
VolumeManager.cpp
Unescape View File

@ -114,7 +114,7 @@ VolumeManager* VolumeManager::Instance() {
VolumeManager::VolumeManager() {
mDebug = false;
mNextObbId = 0;
mNextStubVolumeId = 0;
mNextStubId = 0;
// For security reasons, assume that a secure keyguard is
// showing until we hear otherwise
mSecureKeyguardShowing = true;
@ -340,11 +340,6 @@ std::shared_ptr<android::vold::VolumeBase> VolumeManager::findVolume(const std::
return vol;
}
}
for (const auto& vol : mStubVolumes) {
if (vol->getId() == id) {
return vol;
}
}
for (const auto& vol : mObbVolumes) {
if (vol->getId() == id) {
return vol;
@ -767,7 +762,6 @@ int VolumeManager::shutdown() {
}
mInternalEmulatedVolumes.clear();
mStubVolumes.clear();
mDisks.clear();
mPendingDisks.clear();
android::vold::sSleepOnUnmount = true;
@ -782,9 +776,6 @@ int VolumeManager::unmountAll() {
for (const auto& vol : mInternalEmulatedVolumes) {
vol->unmount();
}
for (const auto& stub : mStubVolumes) {
stub->unmount();
}
for (const auto& disk : mDisks) {
disk->unmountAll();
}
@ -908,27 +899,30 @@ int VolumeManager::destroyObb(const std::string& volId) {
int VolumeManager::createStubVolume(const std::string& sourcePath, const std::string& mountPath,
const std::string& fsType, const std::string& fsUuid,
const std::string& fsLabel, std::string* outVolId) {
int id = mNextStubVolumeId++;
auto vol = std::shared_ptr<android::vold::VolumeBase>(
new android::vold::StubVolume(id, sourcePath, mountPath, fsType, fsUuid, fsLabel));
vol->create();
mStubVolumes.push_back(vol);
const std::string& fsLabel, int32_t flags __unused,
std::string* outVolId) {
dev_t stubId = --mNextStubId;
auto vol = std::shared_ptr<android::vold::StubVolume>(
new android::vold::StubVolume(stubId, sourcePath, mountPath, fsType, fsUuid, fsLabel));
// TODO (b/132796154): Passed each supported flags explicitly here.
// StubDisk doesn't have device node corresponds to it. So, a fake device
// number is used. The supported flags will be infered from the
// currently-unused flags parameter.
auto disk = std::shared_ptr<android::vold::Disk>(
new android::vold::Disk("stub", stubId, "stub", android::vold::Disk::Flags::kStub));
disk->initializePartition(vol);
handleDiskAdded(disk);
*outVolId = vol->getId();
return android::OK;
}
int VolumeManager::destroyStubVolume(const std::string& volId) {
auto i = mStubVolumes.begin();
while (i != mStubVolumes.end()) {
if ((*i)->getId() == volId) {
(*i)->destroy();
i = mStubVolumes.erase(i);
} else {
++i;
}
}
auto tokens = android::base::Split(volId, ":");
CHECK(tokens.size() == 2);
dev_t stubId;
CHECK(android::base::ParseUint(tokens[1], &stubId));
handleDiskRemoved(stubId);
return android::OK;
}

5
VolumeManager.h
Unescape View File

@ -170,7 +170,7 @@ class VolumeManager {
int createStubVolume(const std::string& sourcePath, const std::string& mountPath,
const std::string& fsType, const std::string& fsUuid,
const std::string& fsLabel, std::string* outVolId);
const std::string& fsLabel, int32_t flags, std::string* outVolId);
int destroyStubVolume(const std::string& volId);
int mountAppFuse(uid_t uid, int mountId, android::base::unique_fd* device_fd);
@ -199,7 +199,6 @@ class VolumeManager {
std::list<std::shared_ptr<android::vold::Disk>> mDisks;
std::list<std::shared_ptr<android::vold::Disk>> mPendingDisks;
std::list<std::shared_ptr<android::vold::VolumeBase>> mObbVolumes;
std::list<std::shared_ptr<android::vold::VolumeBase>> mStubVolumes;
std::list<std::shared_ptr<android::vold::VolumeBase>> mInternalEmulatedVolumes;
std::unordered_map<userid_t, int> mAddedUsers;
@ -212,7 +211,7 @@ class VolumeManager {
std::shared_ptr<android::vold::VolumeBase> mPrimary;
int mNextObbId;
int mNextStubVolumeId;
int mNextStubId;
bool mSecureKeyguardShowing;
};

2
binder/android/os/IVold.aidl
Unescape View File

@ -125,7 +125,7 @@ interface IVold {
@utf8InCpp String createStubVolume(@utf8InCpp String sourcePath,
@utf8InCpp String mountPath, @utf8InCpp String fsType,
@utf8InCpp String fsUuid, @utf8InCpp String fsLabel);
@utf8InCpp String fsUuid, @utf8InCpp String fsLabel, int flags);
void destroyStubVolume(@utf8InCpp String volId);
FileDescriptor openAppFuseFile(int uid, int mountId, int fileId, int flags);

19
model/Disk.cpp
Unescape View File

@ -180,6 +180,10 @@ status_t Disk::create() {
auto listener = VolumeManager::Instance()->getListener();
if (listener) listener->onDiskCreated(getId(), mFlags);
if (isStub()) {
createStubVolume();
return OK;
}
readMetadata();
readPartitions();
return OK;
@ -244,6 +248,15 @@ void Disk::createPrivateVolume(dev_t device, const std::string& partGuid) {
vol->create();
}
void Disk::createStubVolume() {
CHECK(mVolumes.size() == 1);
auto listener = VolumeManager::Instance()->getListener();
if (listener) listener->onDiskMetadataChanged(getId(), mSize, mLabel, mSysPath);
if (listener) listener->onDiskScanned(getId());
mVolumes[0]->setDiskId(getId());
mVolumes[0]->create();
}
void Disk::destroyAllVolumes() {
for (const auto& vol : mVolumes) {
vol->destroy();
@ -444,6 +457,12 @@ status_t Disk::readPartitions() {
return OK;
}
void Disk::initializePartition(std::shared_ptr<StubVolume> vol) {
CHECK(isStub());
CHECK(mVolumes.empty());
mVolumes.push_back(vol);
}
status_t Disk::unmountAll() {
for (const auto& vol : mVolumes) {
vol->unmount();

8
model/Disk.h
Unescape View File

@ -17,6 +17,7 @@
#ifndef ANDROID_VOLD_DISK_H
#define ANDROID_VOLD_DISK_H
#include "StubVolume.h"
#include "Utils.h"
#include "VolumeBase.h"
@ -52,6 +53,9 @@ class Disk {
kUsb = 1 << 3,
/* Flag that disk is EMMC internal */
kEmmc = 1 << 4,
/* Flag that disk is Stub disk, i.e., disk that is managed from outside
* Android (e.g., ARC++). */
kStub = 1 << 5,
};
const std::string& getId() const { return mId; }
@ -74,6 +78,7 @@ class Disk {
status_t readMetadata();
status_t readPartitions();
void initializePartition(std::shared_ptr<StubVolume> vol);
status_t unmountAll();
@ -109,11 +114,14 @@ class Disk {
void createPublicVolume(dev_t device);
void createPrivateVolume(dev_t device, const std::string& partGuid);
void createStubVolume();
void destroyAllVolumes();
int getMaxMinors();
bool isStub() { return mFlags & kStub; }
DISALLOW_COPY_AND_ASSIGN(Disk);
};

6
model/StubVolume.cpp
Unescape View File

@ -16,6 +16,8 @@
#include "StubVolume.h"
#include <inttypes.h>
#include <android-base/logging.h>
#include <android-base/stringprintf.h>
@ -24,7 +26,7 @@ using android::base::StringPrintf;
namespace android {
namespace vold {
StubVolume::StubVolume(int id, const std::string& sourcePath, const std::string& mountPath,
StubVolume::StubVolume(dev_t id, const std::string& sourcePath, const std::string& mountPath,
const std::string& fsType, const std::string& fsUuid,
const std::string& fsLabel)
: VolumeBase(Type::kStub),
@ -33,7 +35,7 @@ StubVolume::StubVolume(int id, const std::string& sourcePath, const std::string&
mFsType(fsType),
mFsUuid(fsUuid),
mFsLabel(fsLabel) {
setId(StringPrintf("stub:%d", id));
setId(StringPrintf("stub:%llu", (unsigned long long)id));
}
StubVolume::~StubVolume() {}

2
model/StubVolume.h
Unescape View File

@ -31,7 +31,7 @@ namespace vold {
*/
class StubVolume : public VolumeBase {
public:
StubVolume(int id, const std::string& sourcePath, const std::string& mountPath,
StubVolume(dev_t id, const std::string& sourcePath, const std::string& mountPath,
const std::string& fsType, const std::string& fsUuid, const std::string& fsLabel);
virtual ~StubVolume();

Write Preview
Loading…
Cancel
Save