Skip to contentSkip to conversation

nilfs2-remove-duplicate-unlikely-usage.patch removed from -mm tree

merged mm-nonmm-stable Andrew Morton 1 participant 1 message Sep 9, 2024

lore
Share & tools
lore

Andrew Morton

author tree notice Applied
#0 lore raw

The quilt patch titled
Subject: nilfs2: remove duplicate 'unlikely()' usage
has been removed from the -mm tree. Its filename was
nilfs2-remove-duplicate-unlikely-usage.patch

This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm

------------------------------------------------------
From: Kunwu Chan <[email protected]>
Subject: nilfs2: remove duplicate 'unlikely()' usage
Date: Wed, 4 Sep 2024 19:16:03 +0900

Nested unlikely() calls, IS_ERR already uses unlikely() internally

---

 fs/nilfs2/page.c |    2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
fs/nilfs2/page.c renamed from fs/nilfs2/page.c~nilfs2-remove-duplicate-unlikely-usage +1 -1
@@ -262,7 +262,7 @@ repeat:
 			NILFS_FOLIO_BUG(folio, "inconsistent dirty state");
 
 		dfolio = filemap_grab_folio(dmap, folio->index);
-		if (unlikely(IS_ERR(dfolio))) {
+		if (IS_ERR(dfolio)) {
 			/* No empty page is added to the page cache */
 			folio_unlock(folio);
 			err = PTR_ERR(dfolio);

_

Patches currently in -mm which might be from [email protected] are