| From: Andrew Morton <akpm@linux-foundation.org> |
| Subject: hugetlb-handle-truncate-racing-with-page-faults-fix-fix |
| Date: Sat Aug 27 05:03:27 PM PDT 2022 |
| |
| fix merge snafu |
| |
| Cc: Mike Kravetz <mike.kravetz@oracle.com> |
| Signed-off-by: Andrew Morton <akpm@linux-foundation.org> |
| --- |
| |
| fs/hugetlbfs/inode.c | 1 - |
| 1 file changed, 1 deletion(-) |
| |
| --- a/fs/hugetlbfs/inode.c~hugetlb-handle-truncate-racing-with-page-faults-fix-fix |
| +++ a/fs/hugetlbfs/inode.c |
| @@ -541,7 +541,6 @@ static void remove_inode_hugepages(struc |
| struct folio_batch fbatch; |
| struct folio *folio; |
| pgoff_t next, index; |
| - int i, freed = 0; |
| unsigned int i; |
| long freed = 0; |
| u32 hash; |
| _ |
