staging: lustre: osc: avoid 64 divide in osc_cache_too_much
authorJames Simmons <jsimmons@infradead.org>
Sun, 29 Jan 2017 00:05:26 +0000 (19:05 -0500)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Fri, 3 Feb 2017 12:01:38 +0000 (13:01 +0100)
The use of 64 bit time introduces an expensive 64 bit
division operation. Since the time lapse being calculated
in osc_cache_too_much will never be more than seventy years
we can cast the time lapse to an long and perform a normal
32 bit divison operation instead.

Signed-off-by: James Simmons <uja.ornl@yahoo.com>
Intel-bug-id: https://jira.hpdd.intel.com/browse/LU-8835
Reviewed-on: https://review.whamcloud.com/23814
Reviewed-by: Andreas Dilger <andreas.dilger@intel.com>
Reviewed-by: Dmitry Eremin <dmitry.eremin@intel.com>
Signed-off-by: James Simmons <jsimmons@infradead.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/staging/lustre/lustre/osc/osc_page.c

index 046140867a2722e51abcb6496f616ffda7ec8eec..ab9d0d7bb943b0c6b910ed3b26218a8e6f35d4ea 100644 (file)
@@ -370,12 +370,17 @@ static int osc_cache_too_much(struct client_obd *cli)
                        return lru_shrink_min(cli);
        } else {
                time64_t duration = ktime_get_real_seconds();
+               long timediff;
 
                /* knock out pages by duration of no IO activity */
                duration -= cli->cl_lru_last_used;
-               duration >>= 6; /* approximately 1 minute */
-               if (duration > 0 &&
-                   pages >= div64_s64((s64)budget, duration))
+               /*
+                * The difference shouldn't be more than 70 years
+                * so we can safely case to a long. Round to
+                * approximately 1 minute.
+                */
+               timediff = (long)(duration >> 6);
+               if (timediff > 0 && pages >= budget / timediff)
                        return lru_shrink_min(cli);
        }
        return 0;