Merge tag 'mm-stable-2023-08-28-18-26' of git://git.kernel.org/pub/scm/linux/kernel...

[linux-2.6-block.git] / fs / buffer.c

diff --git a/fs/buffer.c b/fs/buffer.c
index bd091329026c0fe5914f83a16478091b7d0da0a4..0f17c36922e666512a68bdd20ab4e55231ad1c2f 100644 (file)
--- a/fs/buffer.c
+++ b/fs/buffer.c
@@ -49,6 +49,7 @@
 #include <trace/events/block.h>
 #include <linux/fscrypt.h>
 #include <linux/fsverity.h>
+#include <linux/sched/isolation.h>
 
 #include "internal.h"
 
@@ -1225,19 +1226,14 @@ EXPORT_SYMBOL(mark_buffer_dirty);
 
 void mark_buffer_write_io_error(struct buffer_head *bh)
 {
-       struct super_block *sb;
-
        set_buffer_write_io_error(bh);
        /* FIXME: do we need to set this in both places? */
        if (bh->b_folio && bh->b_folio->mapping)
                mapping_set_error(bh->b_folio->mapping, -EIO);
-       if (bh->b_assoc_map)
+       if (bh->b_assoc_map) {
                mapping_set_error(bh->b_assoc_map, -EIO);
-       rcu_read_lock();
-       sb = READ_ONCE(bh->b_bdev->bd_super);
-       if (sb)
-               errseq_set(&sb->s_wb_err, -EIO);
-       rcu_read_unlock();
+               errseq_set(&bh->b_assoc_map->host->i_sb->s_wb_err, -EIO);
+       }
 }
 EXPORT_SYMBOL(mark_buffer_write_io_error);
 
@@ -1352,7 +1348,7 @@ static void bh_lru_install(struct buffer_head *bh)
         * failing page migration.
         * Skip putting upcoming bh into bh_lru until migration is done.
         */
-       if (lru_cache_disabled()) {
+       if (lru_cache_disabled() || cpu_is_isolated(smp_processor_id())) {
                bh_lru_unlock();
                return;
        }
@@ -1382,6 +1378,10 @@ lookup_bh_lru(struct block_device *bdev, sector_t block, unsigned size)
 
        check_irqs_on();
        bh_lru_lock();
+       if (cpu_is_isolated(smp_processor_id())) {
+               bh_lru_unlock();
+               return NULL;
+       }
        for (i = 0; i < BH_LRU_SIZE; i++) {
                struct buffer_head *bh = __this_cpu_read(bh_lrus.bhs[i]);
 
@@ -1539,21 +1539,6 @@ void invalidate_bh_lrus_cpu(void)
        bh_lru_unlock();
 }
 
-void set_bh_page(struct buffer_head *bh,
-               struct page *page, unsigned long offset)
-{
-       bh->b_page = page;
-       BUG_ON(offset >= PAGE_SIZE);
-       if (PageHighMem(page))
-               /*
-                * This catches illegal uses and preserves the offset:
-                */
-               bh->b_data = (char *)(0 + offset);
-       else
-               bh->b_data = page_address(page) + offset;
-}
-EXPORT_SYMBOL(set_bh_page);
-
 void folio_set_bh(struct buffer_head *bh, struct folio *folio,
                  unsigned long offset)
 {
@@ -2180,8 +2165,7 @@ int __block_write_begin(struct page *page, loff_t pos, unsigned len,
 }
 EXPORT_SYMBOL(__block_write_begin);
 
-static int __block_commit_write(struct inode *inode, struct folio *folio,
-               size_t from, size_t to)
+static void __block_commit_write(struct folio *folio, size_t from, size_t to)
 {
        size_t block_start, block_end;
        bool partial = false;
@@ -2216,7 +2200,6 @@ static int __block_commit_write(struct inode *inode, struct folio *folio,
         */
        if (!partial)
                folio_mark_uptodate(folio);
-       return 0;
 }
 
 /*
@@ -2253,7 +2236,6 @@ int block_write_end(struct file *file, struct address_space *mapping,
                        struct page *page, void *fsdata)
 {
        struct folio *folio = page_folio(page);
-       struct inode *inode = mapping->host;
        size_t start = pos - folio_pos(folio);
 
        if (unlikely(copied < len)) {
@@ -2277,7 +2259,7 @@ int block_write_end(struct file *file, struct address_space *mapping,
        flush_dcache_folio(folio);
 
        /* This could be a short (even 0-length) commit */
-       __block_commit_write(inode, folio, start, start + copied);
+       __block_commit_write(folio, start, start + copied);
 
        return copied;
 }
@@ -2598,12 +2580,10 @@ int cont_write_begin(struct file *file, struct address_space *mapping,
 }
 EXPORT_SYMBOL(cont_write_begin);
 
-int block_commit_write(struct page *page, unsigned from, unsigned to)
+void block_commit_write(struct page *page, unsigned from, unsigned to)
 {
        struct folio *folio = page_folio(page);
-       struct inode *inode = folio->mapping->host;
-       __block_commit_write(inode, folio, from, to);
-       return 0;
+       __block_commit_write(folio, from, to);
 }
 EXPORT_SYMBOL(block_commit_write);
 
@@ -2649,11 +2629,11 @@ int block_page_mkwrite(struct vm_area_struct *vma, struct vm_fault *vmf,
                end = size - folio_pos(folio);
 
        ret = __block_write_begin_int(folio, 0, end, get_block, NULL);
-       if (!ret)
-               ret = __block_commit_write(inode, folio, 0, end);
-
-       if (unlikely(ret < 0))
+       if (unlikely(ret))
                goto out_unlock;
+
+       __block_commit_write(folio, 0, end);
+
        folio_mark_dirty(folio);
        folio_wait_stable(folio);
        return 0;