From: Lei Feng <flei@whamcloud.com>
Date: Wed, 26 Apr 2023 01:45:41 +0000 (+0800)
Subject: EX-7391 lipe: lpcc_purge calculates disk usage as df
X-Git-Url: https://git.whamcloud.com/?a=commitdiff_plain;h=3058f7b4397240c654672c0242b85e5c33fcc99d;p=fs%2Flustre-release.git

EX-7391 lipe: lpcc_purge calculates disk usage as df

lpcc_purge calculate disk usage in the same way as df command.

Signed-off-by: Lei Feng <flei@whamcloud.com>
Test-Parameters: trivial testlist=sanity-pcc
Change-Id: I43fe60188b1363d0ba58ea659b560b97807dc019
Reviewed-on: https://review.whamcloud.com/c/ex/lustre-release/+/50753
Tested-by: jenkins <devops@whamcloud.com>
Tested-by: Maloo <maloo@whamcloud.com>
Reviewed-by: Qian Yingjin <qian@ddn.com>
Reviewed-by: Andreas Dilger <adilger@whamcloud.com>
---

diff --git a/lipe/src/lpcc_purge.c b/lipe/src/lpcc_purge.c
index c79c566..3735b4d 100644
--- a/lipe/src/lpcc_purge.c
+++ b/lipe/src/lpcc_purge.c
@@ -881,8 +881,10 @@ static double lpcc_purge_get_fs_usage(const char *fs)
 		exit(1);
 	}
 
-	usage = 100.0 * (statfs_buf.f_blocks - statfs_buf.f_bavail) / statfs_buf.f_blocks;
-	i_usage = 100.0 * (statfs_buf.f_files - statfs_buf.f_ffree) / statfs_buf.f_files;
+	usage = 100.0 * (statfs_buf.f_blocks - statfs_buf.f_bfree) /
+		(statfs_buf.f_blocks - statfs_buf.f_bfree + statfs_buf.f_bavail);
+	i_usage = 100.0 * (statfs_buf.f_files - statfs_buf.f_ffree) /
+		  statfs_buf.f_files;
 
 	return (usage > i_usage) ? usage : i_usage;
 }