shared/util: remove unused t0 in get_backoff_delta_msec()

The argument was unused ever since the function was introduced - remove
it.

Signed-off-by: Emil Velikov <emil.l.velikov@gmail.com>
Link: https://github.com/kmod-project/kmod/pull/361
Signed-off-by: Lucas De Marchi <lucas.de.marchi@gmail.com>

diff --git a/shared/util.c b/shared/util.c
index b09f7662734833b594057c01b190d9f3564bd62a..2ffe5647196e180f228db00d50190401fcd23015 100644 (file)
--- a/shared/util.c
+++ b/shared/util.c
@@ -533,7 +533,7 @@ int sleep_until_msec(unsigned long long msec)
 /*
  * Exponential retry backoff with tail
  */
-unsigned long long get_backoff_delta_msec(unsigned long long t0, unsigned long long tend,
+unsigned long long get_backoff_delta_msec(unsigned long long tend,
                                          unsigned long long *delta)
 {
        unsigned long long t;

diff --git a/shared/util.h b/shared/util.h
index fd03736a39a223fc241df10ab689e59e6ff1fed4..5a4483ea3974d6a202de632fefc6837d7d4a3ac6 100644 (file)
--- a/shared/util.h
+++ b/shared/util.h
@@ -67,7 +67,7 @@ unsigned long long ts_usec(const struct timespec *ts);
 unsigned long long now_usec(void);
 unsigned long long now_msec(void);
 int sleep_until_msec(unsigned long long msec);
-unsigned long long get_backoff_delta_msec(unsigned long long t0, unsigned long long tend,
+unsigned long long get_backoff_delta_msec(unsigned long long tend,
                                          unsigned long long *delta);
 
 /* endianness and alignments                                                */

diff --git a/testsuite/test-util.c b/testsuite/test-util.c
index 609625371c3fbfd1cc4a30992648b0b8556d66ca..13bdf1c0bcbb3e1342b4969be6c33e4cd29133a1 100644 (file)
--- a/testsuite/test-util.c
+++ b/testsuite/test-util.c
@@ -262,31 +262,23 @@ static int test_backoff_time(void)
        unsigned long long delta = 0;
 
        /* Check exponential increments */
-       get_backoff_delta_msec(now_msec(), now_msec() + 10, &delta);
+       get_backoff_delta_msec(now_msec() + 10, &delta);
        assert_return(delta == 1, EXIT_FAILURE);
-       get_backoff_delta_msec(now_msec(), now_msec() + 10, &delta);
+       get_backoff_delta_msec(now_msec() + 10, &delta);
        assert_return(delta == 2, EXIT_FAILURE);
-       get_backoff_delta_msec(now_msec(), now_msec() + 10, &delta);
+       get_backoff_delta_msec(now_msec() + 10, &delta);
        assert_return(delta == 4, EXIT_FAILURE);
-       get_backoff_delta_msec(now_msec(), now_msec() + 10, &delta);
+       get_backoff_delta_msec(now_msec() + 10, &delta);
        assert_return(delta == 8, EXIT_FAILURE);
 
        {
-               unsigned long long t0, tend;
-
                /* Check tail */
                delta = 4;
-               tend = now_msec() + 3;
-               t0 = tend - 10;
-               get_backoff_delta_msec(t0, tend, &delta);
+               get_backoff_delta_msec(now_msec() + 3, &delta);
                assert_return(delta == 2, EXIT_FAILURE);
-               tend = now_msec() + 1;
-               t0 = tend - 9;
-               get_backoff_delta_msec(t0, tend, &delta);
+               get_backoff_delta_msec(now_msec() + 1, &delta);
                assert_return(delta == 1, EXIT_FAILURE);
-               tend = now_msec();
-               t0 = tend - 10;
-               get_backoff_delta_msec(t0, tend, &delta);
+               get_backoff_delta_msec(now_msec(), &delta);
                assert_return(delta == 0, EXIT_FAILURE);
        }
 

diff --git a/tools/modprobe.c b/tools/modprobe.c
index e60bc1bb4be3c0f3786bc9926588c623dabede4d..f919253bb4c8e5eed9a11e16af8a01208ae90c33 100644 (file)
--- a/tools/modprobe.c
+++ b/tools/modprobe.c
@@ -315,7 +315,7 @@ end:
 static int rmmod_do_remove_module(struct kmod_module *mod)
 {
        const char *modname = kmod_module_get_name(mod);
-       unsigned long long interval_msec, t0_msec = 0, tend_msec;
+       unsigned long long interval_msec, tend_msec = 0;
        int flags = 0, err;
 
        SHOW("rmmod %s\n", modname);
@@ -340,17 +340,16 @@ static int rmmod_do_remove_module(struct kmod_module *mod)
                } else if (err == -EAGAIN && wait_msec) {
                        unsigned long long until_msec;
 
-                       if (!t0_msec) {
-                               t0_msec = now_msec();
-                               tend_msec = t0_msec + wait_msec;
+                       if (!tend_msec) {
+                               tend_msec = now_msec() + wait_msec;
                                interval_msec = 1;
                        }
 
-                       until_msec = get_backoff_delta_msec(t0_msec, tend_msec,
-                                                           &interval_msec);
+                       until_msec = get_backoff_delta_msec(tend_msec, &interval_msec);
                        err = sleep_until_msec(until_msec);
 
-                       if (!t0_msec)
+                       /* Error out if now_msec() fails */
+                       if (tend_msec == wait_msec)
                                err = -ENOTSUP;
 
                        if (err < 0) {