ALSA: rme32: Fix the missing snd_card_free() call at probe error

[linux-2.6-microblaze.git] / mm / truncate.c

diff --git a/mm/truncate.c b/mm/truncate.c
index 5c87cdc..9dbf0b7 100644 (file)
--- a/mm/truncate.c
+++ b/mm/truncate.c
@@ -22,7 +22,6 @@
 #include <linux/buffer_head.h> /* grr. try_to_release_page,
                                   do_invalidatepage */
 #include <linux/shmem_fs.h>
-#include <linux/cleancache.h>
 #include <linux/rmap.h>
 #include "internal.h"
 
@@ -205,7 +204,6 @@ static void truncate_cleanup_folio(struct folio *folio)
 static int
 invalidate_complete_page(struct address_space *mapping, struct page *page)
 {
-       int ret;
 
        if (page->mapping != mapping)
                return 0;
@@ -213,9 +211,7 @@ invalidate_complete_page(struct address_space *mapping, struct page *page)
        if (page_has_private(page) && !try_to_release_page(page, 0))
                return 0;
 
-       ret = remove_mapping(mapping, page);
-
-       return ret;
+       return remove_mapping(mapping, page);
 }
 
 int truncate_inode_folio(struct address_space *mapping, struct folio *folio)
@@ -267,7 +263,6 @@ bool truncate_inode_partial_folio(struct folio *folio, loff_t start, loff_t end)
         */
        folio_zero_range(folio, offset, length);
 
-       cleancache_invalidate_page(folio->mapping, &folio->page);
        if (folio_has_private(folio))
                do_invalidatepage(&folio->page, offset, length);
        if (!folio_test_large(folio))
@@ -354,7 +349,7 @@ void truncate_inode_pages_range(struct address_space *mapping,
        bool            same_folio;
 
        if (mapping_empty(mapping))
-               goto out;
+               return;
 
        /*
         * 'start' and 'end' always covers the range of pages to be fully
@@ -445,9 +440,6 @@ void truncate_inode_pages_range(struct address_space *mapping,
                folio_batch_release(&fbatch);
                index++;
        }
-
-out:
-       cleancache_invalidate_inode(mapping);
 }
 EXPORT_SYMBOL(truncate_inode_pages_range);
 
@@ -501,10 +493,6 @@ void truncate_inode_pages_final(struct address_space *mapping)
                xa_unlock_irq(&mapping->i_pages);
        }
 
-       /*
-        * Cleancache needs notification even if there are no pages or shadow
-        * entries.
-        */
        truncate_inode_pages(mapping, 0);
 }
 EXPORT_SYMBOL(truncate_inode_pages_final);
@@ -664,7 +652,7 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
        int did_range_unmap = 0;
 
        if (mapping_empty(mapping))
-               goto out;
+               return 0;
 
        folio_batch_init(&fbatch);
        index = start;
@@ -728,8 +716,6 @@ int invalidate_inode_pages2_range(struct address_space *mapping,
        if (dax_mapping(mapping)) {
                unmap_mapping_pages(mapping, start, end - start + 1, false);
        }
-out:
-       cleancache_invalidate_inode(mapping);
        return ret;
 }
 EXPORT_SYMBOL_GPL(invalidate_inode_pages2_range);