diff options
| author | Curt Wohlgemuth <curtw@google.com> | 2009-09-29 16:06:01 -0400 |
|---|---|---|
| committer | Theodore Ts'o <tytso@mit.edu> | 2009-09-29 16:06:01 -0400 |
| commit | f3dc272fd5e2ae08244796bb39e7e1ce4b25d3b3 (patch) | |
| tree | 795edae4030352dfea7cb79ed5a5b0b5ef3d3afb | |
| parent | 830156c79b0a99ddf0f62496bcf4de640f9f52cd (diff) | |
| download | linux-f3dc272fd5e2ae08244796bb39e7e1ce4b25d3b3.tar.bz2 | |
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>
| -rw-r--r-- | fs/ext4/inode.c | 19 |
1 files changed, 4 insertions, 15 deletions
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index 22fb1a3a045c..ec367bce7215 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c @@ -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; |