iomap: Hold state_lock over call to ifs_set_range_uptodate()

This is really preparation for the next patch, but it lets us call
folio_mark_uptodate() in just one place instead of two.

Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org>

diff --git a/fs/iomap/buffered-io.c b/fs/iomap/buffered-io.c
index 5db54ca29a35acf39324b9354d9d02da21425eed..6e780ca64ce3430d4f2aa51c15c69e8e2af86a64 100644 (file)
--- a/fs/iomap/buffered-io.c
+++ b/fs/iomap/buffered-io.c
@@ -57,30 +57,32 @@ static inline bool ifs_block_is_uptodate(struct iomap_folio_state *ifs,
        return test_bit(block, ifs->state);
 }
 
-static void ifs_set_range_uptodate(struct folio *folio,
+static bool ifs_set_range_uptodate(struct folio *folio,
                struct iomap_folio_state *ifs, size_t off, size_t len)
 {
        struct inode *inode = folio->mapping->host;
        unsigned int first_blk = off >> inode->i_blkbits;
        unsigned int last_blk = (off + len - 1) >> inode->i_blkbits;
        unsigned int nr_blks = last_blk - first_blk + 1;
-       unsigned long flags;
 
-       spin_lock_irqsave(&ifs->state_lock, flags);
        bitmap_set(ifs->state, first_blk, nr_blks);
-       if (ifs_is_fully_uptodate(folio, ifs))
-               folio_mark_uptodate(folio);
-       spin_unlock_irqrestore(&ifs->state_lock, flags);
+       return ifs_is_fully_uptodate(folio, ifs);
 }
 
 static void iomap_set_range_uptodate(struct folio *folio, size_t off,
                size_t len)
 {
        struct iomap_folio_state *ifs = folio->private;
+       unsigned long flags;
+       bool uptodate = true;
 
-       if (ifs)
-               ifs_set_range_uptodate(folio, ifs, off, len);
-       else
+       if (ifs) {
+               spin_lock_irqsave(&ifs->state_lock, flags);
+               uptodate = ifs_set_range_uptodate(folio, ifs, off, len);
+               spin_unlock_irqrestore(&ifs->state_lock, flags);
+       }
+
+       if (uptodate)
                folio_mark_uptodate(folio);
 }