diff mbox series

[SRU,MANTIC,3/5] Revert "UBUNTU: SAUCE: mm: BUG if filemap_alloc_folio gives us a folio with a non-NULL ->private"

Message ID 20231027165347.1462441-4-dimitri.ledkov@canonical.com
State New
Headers show
Series correct cephfs pull request for uidmap support | expand

Commit Message

Dimitri John Ledkov Oct. 27, 2023, 4:53 p.m. UTC 
BugLink: https://bugs.launchpad.net/bugs/2041613

This reverts commit 17fcf5d75d4a433d48d7e74b9020b4e0a566200e.

Signed-off-by: Dimitri John Ledkov <dimitri.ledkov@canonical.com>
---
 mm/filemap.c | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)
diff mbox series

Patch

diff --git a/mm/filemap.c b/mm/filemap.c
index af405453ab..9e44a49bbd 100644
--- a/mm/filemap.c
+++ b/mm/filemap.c
@@ -973,12 +973,10 @@  struct folio *filemap_alloc_folio(gfp_t gfp, unsigned int order)
 			n = cpuset_mem_spread_node();
 			folio = __folio_alloc_node(gfp, order, n);
 		} while (!folio && read_mems_allowed_retry(cpuset_mems_cookie));
-	} else {
-		folio = folio_alloc(gfp, order);
+
+		return folio;
 	}
-	if (folio)
-		VM_BUG_ON_FOLIO(folio->private, folio);
-	return folio;
+	return folio_alloc(gfp, order);
 }
 EXPORT_SYMBOL(filemap_alloc_folio);
 #endif