LU-9019 libcfs: remove cfs_time_XXX_64 wrappers

[fs/lustre-release.git] / lustre / obdclass / lprocfs_status.c

diff --git a/lustre/obdclass/lprocfs_status.c b/lustre/obdclass/lprocfs_status.c
index 0f15606..86a0a01 100644 (file)
--- a/lustre/obdclass/lprocfs_status.c
+++ b/lustre/obdclass/lprocfs_status.c
@@ -469,9 +469,11 @@ static ssize_t blocksize_show(struct kobject *kobj, struct attribute *attr,
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        struct obd_statfs osfs;
-       int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                           cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                           OBD_STATFS_NODELAY);
+       int rc;
+
+       rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
+                       ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+                       OBD_STATFS_NODELAY);
        if (!rc)
                return sprintf(buf, "%u\n", osfs.os_bsize);
 
@@ -485,9 +487,11 @@ static ssize_t kbytestotal_show(struct kobject *kobj, struct attribute *attr,
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        struct obd_statfs osfs;
-       int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                           cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                           OBD_STATFS_NODELAY);
+       int rc;
+
+       rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
+                       ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+                       OBD_STATFS_NODELAY);
        if (!rc) {
                u32 blk_size = osfs.os_bsize >> 10;
                u64 result = osfs.os_blocks;
@@ -508,9 +512,11 @@ static ssize_t kbytesfree_show(struct kobject *kobj, struct attribute *attr,
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        struct obd_statfs osfs;
-       int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                           cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                           OBD_STATFS_NODELAY);
+       int rc;
+
+       rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
+                       ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+                       OBD_STATFS_NODELAY);
        if (!rc) {
                u32 blk_size = osfs.os_bsize >> 10;
                u64 result = osfs.os_bfree;
@@ -531,9 +537,11 @@ static ssize_t kbytesavail_show(struct kobject *kobj, struct attribute *attr,
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        struct obd_statfs osfs;
-       int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                           cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                           OBD_STATFS_NODELAY);
+       int rc;
+
+       rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
+                       ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+                       OBD_STATFS_NODELAY);
        if (!rc) {
                u32 blk_size = osfs.os_bsize >> 10;
                u64 result = osfs.os_bavail;
@@ -554,9 +562,11 @@ static ssize_t filestotal_show(struct kobject *kobj, struct attribute *attr,
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        struct obd_statfs osfs;
-       int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                           cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                           OBD_STATFS_NODELAY);
+       int rc;
+
+       rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
+                       ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+                       OBD_STATFS_NODELAY);
        if (!rc)
                return sprintf(buf, "%llu\n", osfs.os_files);
 
@@ -570,9 +580,11 @@ static ssize_t filesfree_show(struct kobject *kobj, struct attribute *attr,
        struct obd_device *obd = container_of(kobj, struct obd_device,
                                              obd_kset.kobj);
        struct obd_statfs osfs;
-       int rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
-                           cfs_time_shift_64(-OBD_STATFS_CACHE_SECONDS),
-                           OBD_STATFS_NODELAY);
+       int rc;
+
+       rc = obd_statfs(NULL, obd->obd_self_export, &osfs,
+                       ktime_get_seconds() - OBD_STATFS_CACHE_SECONDS,
+                       OBD_STATFS_NODELAY);
        if (!rc)
                return sprintf(buf, "%llu\n", osfs.os_ffree);