The quilt patch titled
Subject: hugetlbfs: fix an NULL vs IS_ERR() bug
has been removed from the -mm tree. Its filename was
mm-filemap-remove-hugetlb-special-casing-in-filemapc-fix.patch
This patch was dropped because it was folded into mm-filemap-remove-hugetlb-special-casing-in-filemapc.patch
------------------------------------------------------
From: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Subject: hugetlbfs: fix an NULL vs IS_ERR() bug
Date: Thu, 28 Sep 2023 08:17:36 +0300
This code was converted from using find_lock_page() which returns NULL,
to calling filemap_lock_hugetlb_folio() which returns -ENOENT. The
check needs to be updated to match. Also IS_ERR() has an unlikely()
built in so we can remove that.
Link: https://lkml.kernel.org/r/1772c296-1417-486f-8eef-171af2192681@moroto.mountain
Fixes: 4649d8d5bb81 ("mm/filemap: remove hugetlb special casing in filemap.c")
Signed-off-by: Dan Carpenter <dan.carpenter@xxxxxxxxxx>
Reviewed-by: Sidhartha Kumar <sidhartha.kumar@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
fs/hugetlbfs/inode.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
--- a/fs/hugetlbfs/inode.c~mm-filemap-remove-hugetlb-special-casing-in-filemapc-fix
+++ a/fs/hugetlbfs/inode.c
@@ -354,7 +354,7 @@ static ssize_t hugetlbfs_read_iter(struc
/* Find the folio */
folio = filemap_lock_hugetlb_folio(h, mapping, index);
- if (unlikely(folio == NULL)) {
+ if (IS_ERR(folio)) {
/*
* We have a HOLE, zero out the user-buffer for the
* length of the hole or request.
_
Patches currently in -mm which might be from dan.carpenter@xxxxxxxxxx are
mm-filemap-remove-hugetlb-special-casing-in-filemapc.patch
