The quilt patch titled
Subject: hugetlb: fix reserve_alloc set but not used compiler warning
has been removed from the -mm tree. Its filename was
hugetlb-clean-up-code-checking-for-fault-truncation-races-fix.patch
This patch was dropped because it was folded into hugetlb-clean-up-code-checking-for-fault-truncation-races.patch
------------------------------------------------------
From: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Subject: hugetlb: fix reserve_alloc set but not used compiler warning
Error path code checking the reserve_alloc variable was removed as it was
determined it was not necessary. However, the variable itself was not
removed at the same time. Remove now.
Link: https://lkml.kernel.org/r/Yyj7HsJWfHDoU24U@monkey
Signed-off-by: Mike Kravetz <mike.kravetz@xxxxxxxxxx>
Reported-by: kernel test robot <lkp@xxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
mm/hugetlb.c | 3 ---
1 file changed, 3 deletions(-)
--- a/mm/hugetlb.c~hugetlb-clean-up-code-checking-for-fault-truncation-races-fix
+++ a/mm/hugetlb.c
@@ -5562,7 +5562,6 @@ static vm_fault_t hugetlb_no_page(struct
spinlock_t *ptl;
unsigned long haddr = address & huge_page_mask(h);
bool new_page, new_pagecache_page = false;
- bool reserve_alloc = false;
/*
* Currently, we are forced to kill the process in the event the
@@ -5618,8 +5617,6 @@ static vm_fault_t hugetlb_no_page(struct
clear_huge_page(page, address, pages_per_huge_page(h));
__SetPageUptodate(page);
new_page = true;
- if (HPageRestoreReserve(page))
- reserve_alloc = true;
if (vma->vm_flags & VM_MAYSHARE) {
int err = hugetlb_add_to_page_cache(page, mapping, idx);
_
Patches currently in -mm which might be from mike.kravetz@xxxxxxxxxx are
hugetlbfs-revert-use-i_mmap_rwsem-to-address-page-fault-truncate-race.patch
hugetlbfs-revert-use-i_mmap_rwsem-for-more-pmd-sharing-synchronization.patch
hugetlb-rename-remove_huge_page-to-hugetlb_delete_from_page_cache.patch
hugetlb-create-remove_inode_single_folio-to-remove-single-file-folio.patch
hugetlb-rename-vma_shareable-and-refactor-code.patch
hugetlb-add-vma-based-lock-for-pmd-sharing.patch
hugetlb-create-hugetlb_unmap_file_folio-to-unmap-single-file-folio.patch
hugetlb-use-new-vma_lock-for-pmd-sharing-synchronization.patch
hugetlb-clean-up-code-checking-for-fault-truncation-races.patch
hugetlb-freeze-allocated-pages-before-creating-hugetlb-pages.patch
hugetlb-freeze-allocated-pages-before-creating-hugetlb-pages-v3.patch
hugetlb-simplify-hugetlb-handling-in-follow_page_mask.patch
