diff options
Diffstat (limited to 'fs')
-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) | |||
5615 | handle_t *current_handle = ext4_journal_current_handle(); | 5615 | handle_t *current_handle = ext4_journal_current_handle(); |
5616 | handle_t *handle; | 5616 | handle_t *handle; |
5617 | 5617 | ||
5618 | if (!ext4_handle_valid(current_handle)) { | ||
5619 | ext4_mark_inode_dirty(current_handle, inode); | ||
5620 | return; | ||
5621 | } | ||
5622 | |||
5623 | handle = ext4_journal_start(inode, 2); | 5618 | handle = ext4_journal_start(inode, 2); |
5624 | if (IS_ERR(handle)) | 5619 | if (IS_ERR(handle)) |
5625 | goto out; | 5620 | goto out; |
5626 | if (current_handle && | 5621 | |
5627 | current_handle->h_transaction != handle->h_transaction) { | 5622 | jbd_debug(5, "marking dirty. outer handle=%p\n", current_handle); |
5628 | /* This task has a transaction open against a different fs */ | 5623 | ext4_mark_inode_dirty(handle, inode); |
5629 | printk(KERN_EMERG "%s: transactions do not match!\n", | 5624 | |
5630 | __func__); | ||
5631 | } else { | ||
5632 | jbd_debug(5, "marking dirty. outer handle=%p\n", | ||
5633 | current_handle); | ||
5634 | ext4_mark_inode_dirty(handle, inode); | ||
5635 | } | ||
5636 | ext4_journal_stop(handle); | 5625 | ext4_journal_stop(handle); |
5637 | out: | 5626 | out: |
5638 | return; | 5627 | return; |