2 files changed, 7 insertions, 14 deletions

diff --git a/fs/jbd2/journal.c b/fs/jbd2/journal.c
index 5804466b5785..179d7d8733f2 100644
--- a/fs/jbd2/journal.c
+++ b/fs/jbd2/journal.c
@@ -2377,10 +2377,8 @@ static struct journal_head *journal_alloc_journal_head(void)
         if (!ret) {
                 jbd_debug(1, "out of memory for journal_head\n");
                 pr_notice_ratelimited("ENOMEM in %s, retrying.\n", __func__);
-                while (!ret) {
-                        yield();
-                        ret = kmem_cache_zalloc(jbd2_journal_head_cache, GFP_NOFS);
-                }
+                ret = kmem_cache_zalloc(jbd2_journal_head_cache,
+                                GFP_NOFS | __GFP_NOFAIL);
         }
         return ret;
 }
diff --git a/fs/jbd2/revoke.c b/fs/jbd2/revoke.c
index 14214da80eb8..0abf2e7f725b 100644
--- a/fs/jbd2/revoke.c
+++ b/fs/jbd2/revoke.c
@@ -141,11 +141,13 @@ static int insert_revoke_hash(journal_t *journal, unsigned long long blocknr,
 {
         struct list_head *hash_list;
         struct jbd2_revoke_record_s *record;
+        gfp_t gfp_mask = GFP_NOFS;
 
-repeat:
-        record = kmem_cache_alloc(jbd2_revoke_record_cache, GFP_NOFS);
+        if (journal_oom_retry)
+                gfp_mask |= __GFP_NOFAIL;
+        record = kmem_cache_alloc(jbd2_revoke_record_cache, gfp_mask);
         if (!record)
-                goto oom;
+                return -ENOMEM;
 
         record->sequence = seq;
         record->blocknr = blocknr;
@@ -154,13 +156,6 @@ repeat:
         list_add(&record->hash, hash_list);
         spin_unlock(&journal->j_revoke_lock);
         return 0;
-
-oom:
-        if (!journal_oom_retry)
-                return -ENOMEM;
-        jbd_debug(1, "ENOMEM in %s, retrying\n", __func__);
-        yield();
-        goto repeat;
 }
 
 /* Find a revoke record in the journal's hash table. */