diff options
Diffstat (limited to 'fs/ext4/ext4_jbd2.c')
| -rw-r--r-- | fs/ext4/ext4_jbd2.c | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index eb27fd0f2ee8..6a9409920dee 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c | |||
| @@ -44,7 +44,7 @@ int __ext4_journal_forget(const char *where, handle_t *handle, | |||
| 44 | handle, err); | 44 | handle, err); |
| 45 | } | 45 | } |
| 46 | else | 46 | else |
| 47 | brelse(bh); | 47 | bforget(bh); |
| 48 | return err; | 48 | return err; |
| 49 | } | 49 | } |
| 50 | 50 | ||
| @@ -60,7 +60,7 @@ int __ext4_journal_revoke(const char *where, handle_t *handle, | |||
| 60 | handle, err); | 60 | handle, err); |
| 61 | } | 61 | } |
| 62 | else | 62 | else |
| 63 | brelse(bh); | 63 | bforget(bh); |
| 64 | return err; | 64 | return err; |
| 65 | } | 65 | } |
| 66 | 66 | ||
| @@ -89,7 +89,10 @@ int __ext4_handle_dirty_metadata(const char *where, handle_t *handle, | |||
| 89 | ext4_journal_abort_handle(where, __func__, bh, | 89 | ext4_journal_abort_handle(where, __func__, bh, |
| 90 | handle, err); | 90 | handle, err); |
| 91 | } else { | 91 | } else { |
| 92 | mark_buffer_dirty(bh); | 92 | if (inode && bh) |
| 93 | mark_buffer_dirty_inode(bh, inode); | ||
| 94 | else | ||
| 95 | mark_buffer_dirty(bh); | ||
| 93 | if (inode && inode_needs_sync(inode)) { | 96 | if (inode && inode_needs_sync(inode)) { |
| 94 | sync_dirty_buffer(bh); | 97 | sync_dirty_buffer(bh); |
| 95 | if (buffer_req(bh) && !buffer_uptodate(bh)) { | 98 | if (buffer_req(bh) && !buffer_uptodate(bh)) { |