Merge tag 'docs-5.19-2' of git://git.lwn.net/linux

[platform/kernel/linux-starfive.git] / fs / nilfs2 / segment.c

diff --git a/fs/nilfs2/segment.c b/fs/nilfs2/segment.c
index 85a8533..0afe083 100644 (file)
--- a/fs/nilfs2/segment.c
+++ b/fs/nilfs2/segment.c
@@ -733,15 +733,18 @@ static void nilfs_lookup_dirty_node_buffers(struct inode *inode,
                                            struct list_head *listp)
 {
        struct nilfs_inode_info *ii = NILFS_I(inode);
-       struct address_space *mapping = &ii->i_btnode_cache;
+       struct inode *btnc_inode = ii->i_assoc_inode;
        struct pagevec pvec;
        struct buffer_head *bh, *head;
        unsigned int i;
        pgoff_t index = 0;
 
+       if (!btnc_inode)
+               return;
+
        pagevec_init(&pvec);
 
-       while (pagevec_lookup_tag(&pvec, mapping, &index,
+       while (pagevec_lookup_tag(&pvec, btnc_inode->i_mapping, &index,
                                        PAGECACHE_TAG_DIRTY)) {
                for (i = 0; i < pagevec_count(&pvec); i++) {
                        bh = head = page_buffers(pvec.pages[i]);
@@ -2410,7 +2413,7 @@ nilfs_remove_written_gcinodes(struct the_nilfs *nilfs, struct list_head *head)
                        continue;
                list_del_init(&ii->i_dirty);
                truncate_inode_pages(&ii->vfs_inode.i_data, 0);
-               nilfs_btnode_cache_clear(&ii->i_btnode_cache);
+               nilfs_btnode_cache_clear(ii->i_assoc_inode->i_mapping);
                iput(&ii->vfs_inode);
        }
 }