From: Kent Overstreet <kent.overstreet@linux.dev>
Date: Sun, 25 Dec 2022 03:45:11 +0000 (-0500)
Subject: bcachefs: (invalidate|release)_folio fixes
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=a6d90385e6915429a891408824b8c72219a139f2;p=linux.git

bcachefs: (invalidate|release)_folio fixes

Signed-off-by: Kent Overstreet <kent.overstreet@linux.dev>
---

diff --git a/fs/bcachefs/fs-io.c b/fs/bcachefs/fs-io.c
index d865081d4a21b..c8f6104553aa5 100644
--- a/fs/bcachefs/fs-io.c
+++ b/fs/bcachefs/fs-io.c
@@ -736,9 +736,6 @@ out:
 
 void bch2_invalidate_folio(struct folio *folio, size_t offset, size_t length)
 {
-	EBUG_ON(!PageLocked(&folio->page));
-	EBUG_ON(folio_test_writeback(folio));
-
 	if (offset || length < folio_size(folio))
 		return;
 
@@ -751,7 +748,7 @@ bool bch2_release_folio(struct folio *folio, gfp_t gfp_mask)
 	EBUG_ON(!PageLocked(&folio->page));
 	EBUG_ON(folio_test_writeback(folio));
 
-	if (folio_test_dirty(folio))
+	if (folio_test_dirty(folio) || folio_test_writeback(folio))
 		return false;
 
 	bch2_clear_page_bits(&folio->page);