nilfs2-do-not-output-warnings-when-clearing-dirty-buffers.patch removed from -mm tree
The quilt patch titled
Subject: nilfs2: do not output warnings when clearing dirty buffers
has been removed from the -mm tree. Its filename was
nilfs2-do-not-output-warnings-when-clearing-dirty-buffers.patch
This patch was dropped because it was merged into the mm-nonmm-stable branch of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm
------------------------------------------------------
From: Ryusuke Konishi <[email protected]>
Subject: nilfs2: do not output warnings when clearing dirty buffers
Date: Fri, 16 Aug 2024 18:01:28 +0900
After detecting file system corruption and degrading to a read-only mount, dirty folios and buffers in the page cache are cleared, and a large number of warnings are output at that time, often filling up the kernel log.
In this case, since the degrading to a read-only mount is output to the kernel log, these warnings are not very meaningful, and are rather a nuisance in system management and debugging.
The related nilfs2-specific page/folio routines have a silent argument that suppresses the warning output, but since it is not currently used meaningfully, remove both the silent argument and the warning output.
---
fs/nilfs2/inode.c | 4 ++-- fs/nilfs2/mdt.c | 6 +++--- fs/nilfs2/page.c | 19 +++---------------- fs/nilfs2/page.h | 4 ++-- 4 files changed, 10 insertions(+), 23 deletions(-)
fs/nilfs2/inode.c renamed from fs/nilfs2/inode.c~nilfs2-do-not-output-warnings-when-clearing-dirty-buffers +2 -2
@@ -162,7 +162,7 @@ static int nilfs_writepages(struct addreint err =0 ;if (sb_rdonly (inode->i_sb)) { -nilfs_clear_dirty_pages (mapping, false); +nilfs_clear_dirty_pages (mapping);return -EROFS ; }
@@ -186,7 +186,7 @@ static int nilfs_writepage(struct page ** have dirty pages that try to be flushed in background. * So, here we simply discard this dirty page. */ -nilfs_clear_folio_dirty (folio, false); +nilfs_clear_folio_dirty (folio);folio_unlock (folio);return -EROFS ; }
fs/nilfs2/mdt.c renamed from fs/nilfs2/mdt.c~nilfs2-do-not-output-warnings-when-clearing-dirty-buffers +3 -3
@@ -411,7 +411,7 @@ nilfs_mdt_write_page(struct page *page,* have dirty folios that try to be flushed in background. * So, here we simply discard this dirty folio. */ -nilfs_clear_folio_dirty (folio, false); +nilfs_clear_folio_dirty (folio);folio_unlock (folio);return -EROFS ; }
@@ -638,10 +638,10 @@ void nilfs_mdt_restore_from_shadow_map(sif (mi->mi_palloc_cache)nilfs_palloc_clear_cache (inode); -nilfs_clear_dirty_pages (inode->i_mapping, true); +nilfs_clear_dirty_pages (inode->i_mapping);nilfs_copy_back_pages (inode->i_mapping, shadow->inode->i_mapping); -nilfs_clear_dirty_pages (ii->i_assoc_inode->i_mapping, true); +nilfs_clear_dirty_pages (ii->i_assoc_inode->i_mapping);nilfs_copy_back_pages (ii->i_assoc_inode->i_mapping,NILFS_I (shadow->inode)->i_assoc_inode->i_mapping);
fs/nilfs2/page.c renamed from fs/nilfs2/page.c~nilfs2-do-not-output-warnings-when-clearing-dirty-buffers +3 -16
@@ -357,9 +357,8 @@ repeat:/** * nilfs_clear_dirty_pages - discard dirty pages in address space * @mapping: address space with dirty pages for discarding -* @silent: suppress [true] or print [false] warning messages */ -void nilfs_clear_dirty_pages (struct address_space *mapping,bool silent) +void nilfs_clear_dirty_pages (struct address_space *mapping) {struct folio_batch fbatch;unsigned int i;
@@ -380,7 +379,7 @@ void nilfs_clear_dirty_pages(struct addr* was acquired. Skip processing in that case. */ if (likely (folio->mapping == mapping)) -nilfs_clear_folio_dirty (folio, silent); +nilfs_clear_folio_dirty (folio);folio_unlock (folio); }
@@ -392,20 +391,13 @@ void nilfs_clear_dirty_pages(struct addr/** * nilfs_clear_folio_dirty - discard dirty folio * @folio: dirty folio that will be discarded -* @silent: suppress [true] or print [false] warning messages */ -void nilfs_clear_folio_dirty (struct folio *folio,bool silent) +void nilfs_clear_folio_dirty (struct folio *folio) { -struct inode *inode = folio->mapping->host; -struct super_block *sb = inode->i_sb;struct buffer_head *bh, *head;BUG_ON (!folio_test_locked (folio)); -if (!silent) -nilfs_warn (sb,"discard dirty page: offset=%lld, ino=%lu" , -folio_pos (folio), inode->i_ino); -folio_clear_uptodate (folio);folio_clear_mappedtodisk (folio);
@@ -419,11 +411,6 @@ void nilfs_clear_folio_dirty(struct foli bh = head;do {lock_buffer (bh); -if (!silent) -nilfs_warn (sb, -"discard dirty block: blocknr=%llu, size=%zu" , - (u64 )bh->b_blocknr, bh->b_size); -set_mask_bits (&bh->b_state, clear_bits,0 );unlock_buffer (bh); }while (bh = bh->b_this_page, bh != head);
fs/nilfs2/page.h renamed from fs/nilfs2/page.h~nilfs2-do-not-output-warnings-when-clearing-dirty-buffers +2 -2
@@ -41,8 +41,8 @@ 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 *); -void nilfs_clear_folio_dirty (struct folio *,bool ); -void nilfs_clear_dirty_pages (struct address_space *,bool ); +void nilfs_clear_folio_dirty (struct folio *folio); +void nilfs_clear_dirty_pages (struct address_space *mapping);unsigned int nilfs_page_count_clean_buffers (struct page *,unsigned int ,unsigned int ); unsigned long nilfs_find_uncommitted_extent(struct inode *inode,
_
Patches currently in -mm which might be from [email protected] are