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]>
---
 lib/fault-inject.c |   11 ++++-------
 1 file changed, 4 insertions(+), 7 deletions(-)

Index: linux-2.6.18/lib/fault-inject.c
===================================================================
--- linux-2.6.18.orig/lib/fault-inject.c
+++ linux-2.6.18/lib/fault-inject.c
@@ -142,9 +142,6 @@ bool should_fail(struct fault_attr *attr
        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
                        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)


-
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to [EMAIL PROTECTED]
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Reply via email to