mirror of
https://mirrors.bfsu.edu.cn/git/linux.git
synced 2024-12-16 07:24:39 +08:00
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: Curt Wohlgemuth <curtw@google.com> Signed-off-by: "Theodore Ts'o" <tytso@mit.edu>
This commit is contained in:
parent
830156c79b
commit
f3dc272fd5
@ -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);
|
||||
ext4_mark_inode_dirty(handle, inode);
|
||||
}
|
||||
|
||||
jbd_debug(5, "marking dirty. outer handle=%p\n", current_handle);
|
||||
ext4_mark_inode_dirty(handle, inode);
|
||||
|
||||
ext4_journal_stop(handle);
|
||||
out:
|
||||
return;
|
||||
|
Loading…
Reference in New Issue
Block a user