x86/speculation: Rework speculative_store_bypass_update()

[mirror_ubuntu-artful-kernel.git] / fs / hugetlbfs / inode.c

diff --git a/fs/hugetlbfs/inode.c b/fs/hugetlbfs/inode.c
index 28d2753be09498769282facb66593c95b91f498a..a9e3b26e1b720bc80d381264bf6be10b4a318b30 100644 (file)
--- a/fs/hugetlbfs/inode.c
+++ b/fs/hugetlbfs/inode.c
@@ -855,9 +855,12 @@ static int hugetlbfs_error_remove_page(struct address_space *mapping,
                                struct page *page)
 {
        struct inode *inode = mapping->host;
+       pgoff_t index = page->index;
 
        remove_huge_page(page);
-       hugetlb_fix_reserve_counts(inode);
+       if (unlikely(hugetlb_unreserve_pages(inode, index, index + 1, 1)))
+               hugetlb_fix_reserve_counts(inode);
+
        return 0;
 }