Skip to content

Commit a7ac59f

Browse files
Matthew Wilcox (Oracle)akpm00
Matthew Wilcox (Oracle)
authored andcommitted
nilfs2: remove calls to folio_set_error() and folio_clear_error()
Nobody checks this flag on nilfs2 folios, stop setting and clearing it. That lets us simplify nilfs_end_folio_io() slightly. Link: https://lkml.kernel.org/r/20240420025029.2166544-17-willy@infradead.org Link: https://lkml.kernel.org/r/20240430050901.3239-1-konishi.ryusuke@gmail.com Signed-off-by: Matthew Wilcox (Oracle) <willy@infradead.org> Signed-off-by: Ryusuke Konishi <konishi.ryusuke@gmail.com> Cc: kernel test robot <lkp@intel.com> Cc: Peter Zijlstra <peterz@infradead.org> Cc: Song Liu <song@kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
1 parent 8fcb916 commit a7ac59f

File tree

2 files changed

+1
-8
lines changed

2 files changed

+1
-8
lines changed

fs/nilfs2/dir.c

-1
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,6 @@ static bool nilfs_check_folio(struct folio *folio, char *kaddr)
174174
dir->i_ino, (folio->index << PAGE_SHIFT) + offs,
175175
(unsigned long)le64_to_cpu(p->inode));
176176
fail:
177-
folio_set_error(folio);
178177
return false;
179178
}
180179

fs/nilfs2/segment.c

+1-7
Original file line numberDiff line numberDiff line change
@@ -1725,14 +1725,8 @@ static void nilfs_end_folio_io(struct folio *folio, int err)
17251725
return;
17261726
}
17271727

1728-
if (!err) {
1729-
if (!nilfs_folio_buffers_clean(folio))
1730-
filemap_dirty_folio(folio->mapping, folio);
1731-
folio_clear_error(folio);
1732-
} else {
1728+
if (err || !nilfs_folio_buffers_clean(folio))
17331729
filemap_dirty_folio(folio->mapping, folio);
1734-
folio_set_error(folio);
1735-
}
17361730

17371731
folio_end_writeback(folio);
17381732
}

0 commit comments

Comments
 (0)