From 6952f4e7979a84f946bf19937715c9d6e8b9b4f0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tomi=20Lepp=C3=A4nen?= Date: Wed, 1 Jul 2020 14:03:29 +0300 Subject: [PATCH] [nemo-systemsettings] Clean up quota checks. Contributes to JB#50347 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit No functional change, just simpler code. Signed-off-by: Tomi Leppänen --- src/partitionmanager.cpp | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/partitionmanager.cpp b/src/partitionmanager.cpp index d34b663..6724a31 100644 --- a/src/partitionmanager.cpp +++ b/src/partitionmanager.cpp @@ -278,7 +278,7 @@ void PartitionManagerPrivate::refresh(const Partitions &partitions, Partitions & for (auto partition : partitions) { if (partition->status == Partition::Mounted) { - qint64 quotaAvailable = -1; + qint64 quotaAvailable = std::numeric_limits::max(); struct if_dqblk quota; if (::quotactl(QCMD(Q_GETQUOTA, USRQUOTA), partition->devicePath.toUtf8().constData(), ::getuid(), (caddr_t)"a) == 0 && quota.dqb_bsoftlimit != 0) @@ -288,9 +288,7 @@ void PartitionManagerPrivate::refresh(const Partitions &partitions, Partitions & if (::statvfs64(partition->mountPath.toUtf8().constData(), &stat) == 0) { partition->bytesTotal = stat.f_blocks * stat.f_frsize; qint64 bytesFree = stat.f_bfree * stat.f_frsize; - qint64 bytesAvailable = stat.f_bavail * stat.f_frsize; - if (quotaAvailable != -1 && bytesAvailable > quotaAvailable) - bytesAvailable = quotaAvailable; + qint64 bytesAvailable = std::min((qint64)(stat.f_bavail * stat.f_frsize), quotaAvailable); partition->readOnly = (stat.f_flag & ST_RDONLY) != 0; if (partition->bytesFree != bytesFree || partition->bytesAvailable != bytesAvailable) {