vold: Honor mount options for ext4/f2fs partitions

[android-x86/system-vold.git] / VolumeManager.h

diff --git a/VolumeManager.h b/VolumeManager.h
index 10af2c9..f69f4bd 100644 (file)
--- a/VolumeManager.h
+++ b/VolumeManager.h
@@ -62,8 +62,12 @@ class VolumeManager {
 
     class DiskSource {
       public:
-        DiskSource(const std::string& sysPattern, const std::string& nickname, int partnum, int flags) :
-                mSysPattern(sysPattern), mNickname(nickname), mPartNum(partnum), mFlags(flags) {
+        DiskSource(const std::string& sysPattern, const std::string& nickname,
+                        int partnum, int flags,
+                        const std::string& fstype, const std::string mntopts) :
+                mSysPattern(sysPattern), mNickname(nickname),
+                mPartNum(partnum), mFlags(flags),
+                mFsType(fstype), mMntOpts(mntopts) {
         }
 
         bool matches(const std::string& sysPath) {
@@ -73,12 +77,16 @@ class VolumeManager {
         const std::string& getNickname() const { return mNickname; }
         int getPartNum() const { return mPartNum; }
         int getFlags() const { return mFlags; }
+        const std::string& getFsType() const { return mFsType; }
+        const std::string& getMntOpts() const { return mMntOpts; }
 
       private:
         std::string mSysPattern;
         std::string mNickname;
         int mPartNum;
         int mFlags;
+        std::string mFsType;
+        std::string mMntOpts;
     };
 
     void addDiskSource(const std::shared_ptr<DiskSource>& diskSource);