Merge branch 'net-enhancements-to-sk_user_data-field'
[linux-2.6-microblaze.git] / mm / util.c
index 0837570..53af0e7 100644 (file)
--- a/mm/util.c
+++ b/mm/util.c
@@ -804,10 +804,10 @@ struct address_space *folio_mapping(struct folio *folio)
                return swap_address_space(folio_swap_entry(folio));
 
        mapping = folio->mapping;
-       if ((unsigned long)mapping & PAGE_MAPPING_ANON)
+       if ((unsigned long)mapping & PAGE_MAPPING_FLAGS)
                return NULL;
 
-       return (void *)((unsigned long)mapping & ~PAGE_MAPPING_FLAGS);
+       return mapping;
 }
 EXPORT_SYMBOL(folio_mapping);