[PATCH] fault-injection: optimize and simplify should_fail()

Trivial optimization and simplification of should_fail().

Do cheaper disqualification tests first (performance gain not quantified).
Simplify logic; eliminate goto.

Signed-off-by: Don Mullis <[email protected]>
Cc: Akinobu Mita <[email protected]>
Signed-off-by: Andrew Morton <[email protected]>
Signed-off-by: Linus Torvalds <[email protected]>

diff --git a/lib/fault-inject.c b/lib/fault-inject.c
index 5da665ac2d89745b19d8af6d673d55f464a8faa8..d143c0faf248f8485f45c6ad655283e9388f8284 100644 (file)
--- a/lib/fault-inject.c
+++ b/lib/fault-inject.c
@@ -142,9 +142,6 @@ bool should_fail(struct fault_attr *attr, ssize_t size)
        if (attr->task_filter && !fail_task(attr, current))
                return false;
 
-       if (!fail_stacktrace(attr))
-               return false;
-
        if (atomic_read(&attr->times) == 0)
                return false;
 
@@ -159,12 +156,12 @@ bool should_fail(struct fault_attr *attr, ssize_t size)
                        return false;
        }
 
-       if (attr->probability > random32() % 100)
-               goto fail;
+       if (attr->probability <= random32() % 100)
+               return false;
 
-       return false;
+       if (!fail_stacktrace(attr))
+               return false;
 
-fail:
        fail_dump(attr);
 
        if (atomic_read(&attr->times) != -1)