jbd2: don't abort if flushing file data failed (e9e34f4e) · Commits · 戴 / test

In ordered mode, the current jbd2 aborts the journal if a file data buffer has an error. But this behavior is unintended, and we found that it has been adopted accidentally. This patch undoes it and just calls printk() instead of aborting the journal. Unlike a similar patch for ext3/jbd, file data buffers are written via generic_writepages(). But we also need to set AS_EIO into their mappings because wait_on_page_writeback_range() clears AS_EIO before a user process sees it. Signed-off-by:

Hidehiro Kawai <hidehiro.kawai.ez@hitachi.com> Signed-off-by:

"Theodore Ts'o" <tytso@mit.edu>

fs/jbd2/commit.c

+20 −4

Original line number	Diff line number	Diff line
		@@ -262,8 +262,18 @@ static int journal_finish_inode_data_buffers(journal_t *journal,
		jinode->i_flags \|= JI_COMMIT_RUNNING;
		spin_unlock(&journal->j_list_lock);
		err = filemap_fdatawait(jinode->i_vfs_inode->i_mapping);
		if (err) {
		/*
		* Because AS_EIO is cleared by
		* wait_on_page_writeback_range(), set it again so
		* that user process can get -EIO from fsync().
		*/
		set_bit(AS_EIO,
		&jinode->i_vfs_inode->i_mapping->flags);

		if (!ret)
		ret = err;
		}
		spin_lock(&journal->j_list_lock);
		jinode->i_flags &= ~JI_COMMIT_RUNNING;
		wake_up_bit(&jinode->i_flags, __JI_COMMIT_RUNNING);
		@@ -670,8 +680,14 @@ start_journal_io:
		* commit block, which happens below in such setting.
		*/
		err = journal_finish_inode_data_buffers(journal, commit_transaction);
		if (err)
		jbd2_journal_abort(journal, err);
		if (err) {
		char b[BDEVNAME_SIZE];

		printk(KERN_WARNING
		"JBD2: Detected IO errors while flushing file data "
		"on %s\n", bdevname(journal->j_fs_dev, b));
		err = 0;
		}

		/* Lo and behold: we have just managed to send a transaction to
		the log. Before we can commit it, wait for the IO so far to

Admin message