From 09f7754713561a9d42f1dee9fbed77d84d6bc1e3 Mon Sep 17 00:00:00 2001 From: Ivailo Monev Date: Sat, 9 Sep 2023 08:59:08 +0300 Subject: [PATCH] soliduiserver: do not use umount2() for unmounting umount2() does not work for removed devices and a mount-point cleaner will be implemented soon Signed-off-by: Ivailo Monev --- soliduiserver/soliduiserver_helper.cpp | 17 ----------------- 1 file changed, 17 deletions(-) diff --git a/soliduiserver/soliduiserver_helper.cpp b/soliduiserver/soliduiserver_helper.cpp index 0cb636ad..8a4b29fb 100644 --- a/soliduiserver/soliduiserver_helper.cpp +++ b/soliduiserver/soliduiserver_helper.cpp @@ -25,11 +25,6 @@ #include #include -#ifdef Q_OS_LINUX -# include -# include -#endif - SolidUiServerHelper::SolidUiServerHelper(const char* const helper, QObject *parent) : KAuthorization(helper, parent) { @@ -142,17 +137,6 @@ int SolidUiServerHelper::unmount(const QVariantMap ¶meters) } const QString mountpoint = parameters.value("mountpoint").toString(); - -#ifdef Q_OS_LINUX - const QByteArray mountpointbytes = mountpoint.toLocal8Bit(); - const int umountresult = ::umount2(mountpointbytes.constData(), 0); - if (umountresult == 0) { - return KAuthorization::NoError; - } - const int savederrno = errno; - kWarning() << qt_error_string(savederrno); - return KAuthorization::HelperError; -#else const QStringList umountargs = QStringList() << mountpoint; QProcess umountproc; umountproc.start("umount", umountargs); @@ -168,7 +152,6 @@ int SolidUiServerHelper::unmount(const QVariantMap ¶meters) } kWarning() << umounterror; return KAuthorization::HelperError; -#endif // Q_OS_LINUX } K_AUTH_MAIN("org.kde.soliduiserver.mountunmounthelper", SolidUiServerHelper)