iomap: Use kmap_local_page instead of kmap_atomic
authorMatthew Wilcox (Oracle) <willy@infradead.org>
Thu, 5 Aug 2021 03:07:33 +0000 (20:07 -0700)
committerDarrick J. Wong <djwong@kernel.org>
Thu, 5 Aug 2021 17:30:33 +0000 (10:30 -0700)
kmap_atomic() has the side-effect of disabling pagefaults and
preemption.  kmap_local_page() does not do this and is preferred.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>
Reviewed-by: Darrick J. Wong <djwong@kernel.org>
Signed-off-by: Darrick J. Wong <djwong@kernel.org>
fs/iomap/buffered-io.c

index c1c8cd41ea81e265cece4dd6b9b3ab7c9d0c690b..8ee0211bea860f1f1eb5677071903b729b2869d5 100644 (file)
@@ -223,10 +223,10 @@ static int iomap_read_inline_data(struct inode *inode, struct page *page,
        if (poff > 0)
                iomap_page_create(inode, page);
 
-       addr = kmap_atomic(page) + poff;
+       addr = kmap_local_page(page) + poff;
        memcpy(addr, iomap->inline_data, size);
        memset(addr + size, 0, PAGE_SIZE - poff - size);
-       kunmap_atomic(addr);
+       kunmap_local(addr);
        iomap_set_range_uptodate(page, poff, PAGE_SIZE - poff);
        return PAGE_SIZE - poff;
 }
@@ -682,9 +682,9 @@ static size_t iomap_write_end_inline(struct inode *inode, struct page *page,
        BUG_ON(!iomap_inline_data_valid(iomap));
 
        flush_dcache_page(page);
-       addr = kmap_atomic(page);
-       memcpy(iomap_inline_data(iomap, pos), addr + pos, copied);
-       kunmap_atomic(addr);
+       addr = kmap_local_page(page) + pos;
+       memcpy(iomap_inline_data(iomap, pos), addr, copied);
+       kunmap_local(addr);
 
        mark_inode_dirty(inode);
        return copied;