1 files changed, 51 insertions, 0 deletions

diff --git a/src/corelib/io/qstorageinfo_unix.cpp b/src/corelib/io/qstorageinfo_unix.cpp
index ae5c42ffd1..fcc7b8ca50 100644
--- a/src/corelib/io/qstorageinfo_unix.cpp
+++ b/src/corelib/io/qstorageinfo_unix.cpp
@@ -120,6 +120,7 @@ public:
     inline QString rootPath() const;
     inline QByteArray fileSystemType() const;
     inline QByteArray device() const;
+    inline QByteArray options() const;
 private:
 #if defined(Q_OS_BSD4)
     QT_STATFSBUF *stat_buf;
@@ -133,6 +134,7 @@ private:
     QByteArray m_rootPath;
     QByteArray m_fileSystemType;
     QByteArray m_device;
+    QByteArray m_options;
 #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
     FILE *fp;
     mntent mnt;
@@ -228,6 +230,11 @@ inline QByteArray QStorageIterator::device() const
     return QByteArray(stat_buf[currentIndex].f_mntfromname);
 }
 
+inline QByteArray QStorageIterator::options() const
+{
+    return QByteArray();
+}
+
 #elif defined(Q_OS_SOLARIS)
 
 static const char pathMounted[] = "/etc/mnttab";
@@ -301,6 +308,7 @@ inline bool QStorageIterator::next()
     m_device = data.at(0);
     m_rootPath = data.at(1);
     m_fileSystemType = data.at(2);
+    m_options = data.at(3);
 
     return true;
 }
@@ -320,6 +328,11 @@ inline QByteArray QStorageIterator::device() const
     return m_device;
 }
 
+inline QByteArray QStorageIterator::options() const
+{
+    return m_options;
+}
+
 #elif defined(Q_OS_LINUX) || defined(Q_OS_HURD)
 
 static const char pathMounted[] = "/etc/mtab";
@@ -363,6 +376,11 @@ inline QByteArray QStorageIterator::device() const
     return QByteArray(mnt.mnt_fsname);
 }
 
+inline QByteArray QStorageIterator::options() const
+{
+    return QByteArray(mnt.mnt_opts);
+}
+
 #elif defined(Q_OS_HAIKU)
 inline QStorageIterator::QStorageIterator()
 {
@@ -420,6 +438,11 @@ inline QByteArray QStorageIterator::device() const
     return m_device;
 }
 
+inline QByteArray QStorageIterator::options() const
+{
+    return QByteArray();
+}
+
 #else
 
 inline QStorageIterator::QStorageIterator()
@@ -455,8 +478,35 @@ inline QByteArray QStorageIterator::device() const
     return QByteArray();
 }
 
+inline QByteArray QStorageIterator::options() const
+{
+    return QByteArray();
+}
+
 #endif
 
+static QByteArray extractSubvolume(const QStorageIterator &it)
+{
+#ifdef Q_OS_LINUX
+    if (it.fileSystemType() == "btrfs") {
+        const QByteArrayList opts = it.options().split(',');
+        QByteArray id;
+        for (const QByteArray &opt : opts) {
+            static const char subvol[] = "subvol=";
+            static const char subvolid[] = "subvolid=";
+            if (opt.startsWith(subvol))
+                return std::move(opt).mid(strlen(subvol));
+            if (opt.startsWith(subvolid))
+                id = std::move(opt).mid(strlen(subvolid));
+        }
+
+        // if we didn't find the subvolume name, return the subvolume ID
+        return id;
+    }
+#endif
+    return QByteArray();
+}
+
 void QStorageInfoPrivate::initRootPath()
 {
     rootPath = QFileInfo(rootPath).canonicalFilePath();
@@ -483,6 +533,7 @@ void QStorageInfoPrivate::initRootPath()
             rootPath = mountDir;
             device = it.device();
             fileSystemType = fsName;
+            subvolume = extractSubvolume(it);
         }
     }
 }