diff options
author | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:41:41 +0300 |
---|---|---|
committer | Ingo Molnar <mingo@kernel.org> | 2017-08-17 10:41:41 +0300 |
commit | 927d2c21f2e82b93c791799c8da932a9bdffb436 (patch) | |
tree | aec52fd2d3903751d696e809628d155c825ac730 /lib/fault-inject.c | |
parent | cf31b7dd51b542f9a9b2d0de416b5524dfdb1cf2 (diff) | |
parent | ac9a40905a610fb02086a37b11ff4bf046825a88 (diff) | |
download | linux-927d2c21f2e82b93c791799c8da932a9bdffb436.tar.xz |
Merge branch 'linus' into perf/core, to pick up fixes
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'lib/fault-inject.c')
-rw-r--r-- | lib/fault-inject.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/lib/fault-inject.c b/lib/fault-inject.c index 7d315fdb9f13..cf7b129b0b2b 100644 --- a/lib/fault-inject.c +++ b/lib/fault-inject.c @@ -110,10 +110,12 @@ bool should_fail(struct fault_attr *attr, ssize_t size) if (in_task()) { unsigned int fail_nth = READ_ONCE(current->fail_nth); - if (fail_nth && !WRITE_ONCE(current->fail_nth, fail_nth - 1)) - goto fail; + if (fail_nth) { + if (!WRITE_ONCE(current->fail_nth, fail_nth - 1)) + goto fail; - return false; + return false; + } } /* No need to check any other properties if the probability is 0 */ |