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

Commit f3dc272f authored by Curt Wohlgemuth's avatar Curt Wohlgemuth Committed by Theodore Ts'o
Browse files

ext4: Make sure ext4_dirty_inode() updates the inode in no journal mode 



This patch a problem that ext4_dirty_inode() was not calling
ext4_mark_inode_dirty() if the current_handle is not valid, which it
is the case in no journal mode.

It also removes a test for non-matching transaction which can never
happen.

Signed-off-by: default avatarCurt Wohlgemuth <curtw@google.com>
Signed-off-by: default avatar"Theodore Ts'o" <tytso@mit.edu>
parent 830156c7

fs/ext4/inode.c

+4 −15
Original line number Diff line number Diff line
@@ -5615,24 +5615,13 @@ void ext4_dirty_inode(struct inode *inode) 
	handle_t *current_handle = ext4_journal_current_handle();

	handle_t *handle;



	if (!ext4_handle_valid(current_handle)) {

		ext4_mark_inode_dirty(current_handle, inode);

		return;

	}



	handle = ext4_journal_start(inode, 2);

	if (IS_ERR(handle))

		goto out;

	if (current_handle &&

		current_handle->h_transaction != handle->h_transaction) {

		/* This task has a transaction open against a different fs */

		printk(KERN_EMERG "%s: transactions do not match!\n",

		       __func__);

	} else {

		jbd_debug(5, "marking dirty.  outer handle=%p\n",

				current_handle);



	jbd_debug(5, "marking dirty.  outer handle=%p\n", current_handle);

	ext4_mark_inode_dirty(handle, inode);

	}



	ext4_journal_stop(handle);

out:

	return;