Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 0cb4f655 authored by Theodore Ts'o's avatar Theodore Ts'o Committed by Greg Kroah-Hartman
Browse files

ext4: check for shutdown and r/o file system in ext4_write_inode() 



commit 18f2c4fcebf2582f96cbd5f2238f4f354a0e4847 upstream.

If the file system has been shut down or is read-only, then
ext4_write_inode() needs to bail out early.

Also use jbd2_complete_transaction() instead of ext4_force_commit() so
we only force a commit if it is needed.

Signed-off-by: default avatarTheodore Ts'o <tytso@mit.edu>
Cc: stable@kernel.org
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent bf2fd1f9

fs/ext4/inode.c

+7 −2
Original line number Original line Diff line number Diff line
@@ -5369,9 +5369,13 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 
{

{

	int err;

	int err;





	if (WARN_ON_ONCE(current->flags & PF_MEMALLOC))

	if (WARN_ON_ONCE(current->flags & PF_MEMALLOC) ||

	    sb_rdonly(inode->i_sb))

		return 0;

		return 0;





	if (unlikely(ext4_forced_shutdown(EXT4_SB(inode->i_sb))))

		return -EIO;



	if (EXT4_SB(inode->i_sb)->s_journal) {

	if (EXT4_SB(inode->i_sb)->s_journal) {

		if (ext4_journal_current_handle()) {

		if (ext4_journal_current_handle()) {

			jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");

			jbd_debug(1, "called recursively, non-PF_MEMALLOC!\n");
@@ -5387,7 +5391,8 @@ int ext4_write_inode(struct inode *inode, struct writeback_control *wbc) 
		if (wbc->sync_mode != WB_SYNC_ALL || wbc->for_sync)

		if (wbc->sync_mode != WB_SYNC_ALL || wbc->for_sync)

			return 0;

			return 0;





		err = ext4_force_commit(inode->i_sb);

		err = jbd2_complete_transaction(EXT4_SB(inode->i_sb)->s_journal,

						EXT4_I(inode)->i_sync_tid);

	} else {

	} else {

		struct ext4_iloc iloc;

		struct ext4_iloc iloc;