x86/fpu: Provide fpu_enable_guest_xfd_features() for KVM

[linux-2.6-microblaze.git] / mm / memory-failure.c

diff --git a/mm/memory-failure.c b/mm/memory-failure.c
index f64ebb6..07c875f 100644 (file)
--- a/mm/memory-failure.c
+++ b/mm/memory-failure.c
@@ -58,7 +58,6 @@
 #include <linux/ratelimit.h>
 #include <linux/page-isolation.h>
 #include <linux/pagewalk.h>
-#include <linux/shmem_fs.h>
 #include "internal.h"
 #include "ras/ras_event.h"
 
@@ -868,7 +867,6 @@ static int me_pagecache_clean(struct page_state *ps, struct page *p)
 {
        int ret;
        struct address_space *mapping;
-       bool extra_pins;
 
        delete_from_lru_cache(p);
 
@@ -897,24 +895,18 @@ static int me_pagecache_clean(struct page_state *ps, struct page *p)
                goto out;
        }
 
-       /*
-        * The shmem page is kept in page cache instead of truncating
-        * so is expected to have an extra refcount after error-handling.
-        */
-       extra_pins = shmem_mapping(mapping);
-
        /*
         * Truncation is a bit tricky. Enable it per file system for now.
         *
         * Open: to take i_rwsem or not for this? Right now we don't.
         */
        ret = truncate_error_page(p, page_to_pfn(p), mapping);
-       if (has_extra_refcount(ps, p, extra_pins))
-               ret = MF_FAILED;
-
 out:
        unlock_page(p);
 
+       if (has_extra_refcount(ps, p, false))
+               ret = MF_FAILED;
+
        return ret;
 }