summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--mm/memory-failure.c11
1 files changed, 7 insertions, 4 deletions
diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index 6375fe9be87b..0c08e803ed42 100644
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -1919,10 +1919,13 @@ retry:
if (ret > 0) {
ret = soft_offline_in_use_page(page);
} else if (ret == 0) {
- if (!page_handle_poison(page, true, false) && try_again) {
- try_again = false;
- flags &= ~MF_COUNT_INCREASED;
- goto retry;
+ if (!page_handle_poison(page, true, false)) {
+ if (try_again) {
+ try_again = false;
+ flags &= ~MF_COUNT_INCREASED;
+ goto retry;
+ }
+ ret = -EBUSY;
}
} else if (ret == -EIO) {
pr_info("%s: %#lx: unknown page type: %lx (%pGP)\n",