Commit b4f19e3b authored by Matthew Wilcox (Oracle)'s avatar Matthew Wilcox (Oracle) Committed by Andrew Morton
Browse files

nilfs2: convert nilfs_page_bug() to nilfs_folio_bug() 

All callers have a folio now, so convert it.

Link: https://lkml.kernel.org/r/20231127143036.2425-18-konishi.ryusuke@gmail.com


Signed-off-by: default avatarMatthew Wilcox (Oracle) <willy@infradead.org>
Signed-off-by: default avatarRyusuke Konishi <konishi.ryusuke@gmail.com>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
parent 9bff5f98

fs/nilfs2/btnode.c

+2 −2
Original line number Diff line number Diff line
@@ -190,7 +190,7 @@ int nilfs_btnode_prepare_change_key(struct address_space *btnc, 
retry:

		/* BUG_ON(oldkey != obh->b_folio->index); */

		if (unlikely(oldkey != ofolio->index))

			NILFS_PAGE_BUG(&ofolio->page,

			NILFS_FOLIO_BUG(ofolio,

				       "invalid oldkey %lld (newkey=%lld)",

				       (unsigned long long)oldkey,

				       (unsigned long long)newkey);
@@ -246,7 +246,7 @@ void nilfs_btnode_commit_change_key(struct address_space *btnc, 
	if (nbh == NULL) {	/* blocksize == pagesize */

		ofolio = obh->b_folio;

		if (unlikely(oldkey != ofolio->index))

			NILFS_PAGE_BUG(&ofolio->page,

			NILFS_FOLIO_BUG(ofolio,

				       "invalid oldkey %lld (newkey=%lld)",

				       (unsigned long long)oldkey,

				       (unsigned long long)newkey);

fs/nilfs2/page.c

+13 −12
Original line number Diff line number Diff line
@@ -150,29 +150,30 @@ bool nilfs_folio_buffers_clean(struct folio *folio) 
	return true;

}



void nilfs_page_bug(struct page *page)

void nilfs_folio_bug(struct folio *folio)

{

	struct buffer_head *bh, *head;

	struct address_space *m;

	unsigned long ino;



	if (unlikely(!page)) {

		printk(KERN_CRIT "NILFS_PAGE_BUG(NULL)\n");

	if (unlikely(!folio)) {

		printk(KERN_CRIT "NILFS_FOLIO_BUG(NULL)\n");

		return;

	}



	m = page->mapping;

	m = folio->mapping;

	ino = m ? m->host->i_ino : 0;



	printk(KERN_CRIT "NILFS_PAGE_BUG(%p): cnt=%d index#=%llu flags=0x%lx "

	printk(KERN_CRIT "NILFS_FOLIO_BUG(%p): cnt=%d index#=%llu flags=0x%lx "

	       "mapping=%p ino=%lu\n",

	       page, page_ref_count(page),

	       (unsigned long long)page->index, page->flags, m, ino);

	       folio, folio_ref_count(folio),

	       (unsigned long long)folio->index, folio->flags, m, ino);



	if (page_has_buffers(page)) {

		struct buffer_head *bh, *head;

	head = folio_buffers(folio);

	if (head) {

		int i = 0;



		bh = head = page_buffers(page);

		bh = head;

		do {

			printk(KERN_CRIT

			       " BH[%d] %p: cnt=%d block#=%llu state=0x%lx\n",
@@ -258,7 +259,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, 


		folio_lock(folio);

		if (unlikely(!folio_test_dirty(folio)))

			NILFS_PAGE_BUG(&folio->page, "inconsistent dirty state");

			NILFS_FOLIO_BUG(folio, "inconsistent dirty state");



		dfolio = filemap_grab_folio(dmap, folio->index);

		if (unlikely(IS_ERR(dfolio))) {
@@ -268,7 +269,7 @@ int nilfs_copy_dirty_pages(struct address_space *dmap, 
			break;

		}

		if (unlikely(!folio_buffers(folio)))

			NILFS_PAGE_BUG(&folio->page,

			NILFS_FOLIO_BUG(folio,

				       "found empty page in dat page cache");



		nilfs_copy_folio(dfolio, folio, true);

fs/nilfs2/page.h

+3 −3
Original line number Diff line number Diff line
@@ -37,7 +37,7 @@ struct buffer_head *nilfs_grab_buffer(struct inode *, struct address_space *, 
void nilfs_forget_buffer(struct buffer_head *);

void nilfs_copy_buffer(struct buffer_head *, struct buffer_head *);

bool nilfs_folio_buffers_clean(struct folio *);

void nilfs_page_bug(struct page *);

void nilfs_folio_bug(struct folio *);



int nilfs_copy_dirty_pages(struct address_space *, struct address_space *);

void nilfs_copy_back_pages(struct address_space *, struct address_space *);
@@ -49,7 +49,7 @@ unsigned long nilfs_find_uncommitted_extent(struct inode *inode, 
					    sector_t start_blk,

					    sector_t *blkoff);



#define NILFS_PAGE_BUG(page, m, a...) \

	do { nilfs_page_bug(page); BUG(); } while (0)

#define NILFS_FOLIO_BUG(folio, m, a...) \

	do { nilfs_folio_bug(folio); BUG(); } while (0)



#endif /* _NILFS_PAGE_H */