|
@@ -4959,7 +4959,12 @@ int ext4_change_inode_journal_flag(struct inode *inode, int val)
|
|
if (val)
|
|
if (val)
|
|
ext4_set_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
|
|
ext4_set_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
|
|
else {
|
|
else {
|
|
- jbd2_journal_flush(journal);
|
|
|
|
|
|
+ err = jbd2_journal_flush(journal);
|
|
|
|
+ if (err < 0) {
|
|
|
|
+ jbd2_journal_unlock_updates(journal);
|
|
|
|
+ ext4_inode_resume_unlocked_dio(inode);
|
|
|
|
+ return err;
|
|
|
|
+ }
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
|
|
ext4_clear_inode_flag(inode, EXT4_INODE_JOURNAL_DATA);
|
|
}
|
|
}
|
|
ext4_set_aops(inode);
|
|
ext4_set_aops(inode);
|