Skip to content

Commit

Permalink
Revert "ext4: Avoid writeback path when fs is shut down"
Browse files Browse the repository at this point in the history
This reverts commit f50891a.

The patch didn't work to supress the sporadic

"ext4_writepages: jbd2_start: XXX pages, ino YYY; err -5" warnings we
sometimes get when mxqd tries to unmount the temporary job filesystems
using

- fcntl EXT4_IOC_SHUTDOWN with EXT4_GOING_FLAGS_NOLOGFLUSH
- dmestup reload $dmname --table "0 $sectors zero"
- dmsetup resume $dmname --noflush
- umount $mountpoint
- dmsetup remove --deferred $dmname
- rmdir $mountpoint

to avoid writeback.
  • Loading branch information
donald committed Sep 28, 2022
1 parent f730c34 commit b8b56e3
Showing 1 changed file with 0 additions and 8 deletions.
8 changes: 0 additions & 8 deletions fs/ext4/super.c
Original file line number Diff line number Diff line change
Expand Up @@ -523,10 +523,6 @@ static int ext4_journalled_submit_inode_data_buffers(struct jbd2_inode *jinode)
static int ext4_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)
{
int ret;
journal_t *journal = EXT4_SB(jinode->i_vfs_inode->i_sb)->s_journal;

if (!journal || is_journal_aborted(journal))
return 0;

if (ext4_should_journal_data(jinode->i_vfs_inode))
ret = ext4_journalled_submit_inode_data_buffers(jinode);
Expand All @@ -539,10 +535,6 @@ static int ext4_journal_submit_inode_data_buffers(struct jbd2_inode *jinode)
static int ext4_journal_finish_inode_data_buffers(struct jbd2_inode *jinode)
{
int ret = 0;
journal_t *journal = EXT4_SB(jinode->i_vfs_inode->i_sb)->s_journal;

if (!journal || is_journal_aborted(journal))
return 0;

if (!ext4_should_journal_data(jinode->i_vfs_inode))
ret = jbd2_journal_finish_inode_data_buffers(jinode);
Expand Down

0 comments on commit b8b56e3

Please sign in to comment.