On Mon, 2018-02-19 at 11:45 -0800, Matthew Wilcox wrote: > From: Matthew Wilcox <[email protected]> > > XFS currently contains a copy-and-paste of __set_page_dirty(). Export > it from buffer.c instead. > > Signed-off-by: Matthew Wilcox <[email protected]> > --- > fs/buffer.c | 3 ++- > fs/xfs/xfs_aops.c | 15 ++------------- > include/linux/mm.h | 1 + > 3 files changed, 5 insertions(+), 14 deletions(-) > > diff --git a/fs/buffer.c b/fs/buffer.c > index 9a73924db22f..0b487cdb7124 100644 > --- a/fs/buffer.c > +++ b/fs/buffer.c > @@ -594,7 +594,7 @@ EXPORT_SYMBOL(mark_buffer_dirty_inode); > * > * The caller must hold lock_page_memcg(). > */ > -static void __set_page_dirty(struct page *page, struct address_space > *mapping, > +void __set_page_dirty(struct page *page, struct address_space *mapping, > int warn) > { > unsigned long flags; > @@ -608,6 +608,7 @@ static void __set_page_dirty(struct page *page, struct > address_space *mapping, > } > spin_unlock_irqrestore(&mapping->tree_lock, flags); > } > +EXPORT_SYMBOL_GPL(__set_page_dirty); > > /* > * Add a page to the dirty page list. > diff --git a/fs/xfs/xfs_aops.c b/fs/xfs/xfs_aops.c > index 9c6a830da0ee..31f2c4895a46 100644 > --- a/fs/xfs/xfs_aops.c > +++ b/fs/xfs/xfs_aops.c > @@ -1472,19 +1472,8 @@ xfs_vm_set_page_dirty( > newly_dirty = !TestSetPageDirty(page); > spin_unlock(&mapping->private_lock); > > - if (newly_dirty) { > - /* sigh - __set_page_dirty() is static, so copy it here, too */ > - unsigned long flags; > - > - spin_lock_irqsave(&mapping->tree_lock, flags); > - if (page->mapping) { /* Race with truncate? */ > - WARN_ON_ONCE(!PageUptodate(page)); > - account_page_dirtied(page, mapping); > - radix_tree_tag_set(&mapping->page_tree, > - page_index(page), PAGECACHE_TAG_DIRTY); > - } > - spin_unlock_irqrestore(&mapping->tree_lock, flags); > - } > + if (newly_dirty) > + __set_page_dirty(page, mapping, 1); > unlock_page_memcg(page); > if (newly_dirty) > __mark_inode_dirty(mapping->host, I_DIRTY_PAGES); > diff --git a/include/linux/mm.h b/include/linux/mm.h > index ad06d42adb1a..47b0fb0a6e41 100644 > --- a/include/linux/mm.h > +++ b/include/linux/mm.h > @@ -1454,6 +1454,7 @@ extern int try_to_release_page(struct page * page, > gfp_t gfp_mask); > extern void do_invalidatepage(struct page *page, unsigned int offset, > unsigned int length); > > +void __set_page_dirty(struct page *, struct address_space *, int warn); > int __set_page_dirty_nobuffers(struct page *page); > int __set_page_dirty_no_writeback(struct page *page); > int redirty_page_for_writepage(struct writeback_control *wbc,
Acked-by: Jeff Layton <[email protected]>
