diff options
| author | Thomas Gleixner <tglx@linutronix.de> | 2017-04-15 15:31:11 +0200 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2017-04-15 15:31:11 +0200 |
| commit | d1b25279c1a3fe99a14b3afc6d590e218f854b10 (patch) | |
| tree | c5bb8bf18477aafe66ed22380846c8967ea21939 /fs/ext4/inline.c | |
| parent | genirq: Use cpumask_available() for check of cpumask variable (diff) | |
| parent | irqchip/irq-imx-gpcv2: Clear OF_POPULATED flag (diff) | |
| download | linux-d1b25279c1a3fe99a14b3afc6d590e218f854b10.tar.xz linux-d1b25279c1a3fe99a14b3afc6d590e218f854b10.zip | |
Merge tag 'irqchip-4.12' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms into irq/core
Pull irqchip updates from Marc Zyngier
- Unify gemini and moxa irqchips under the faraday banner
- Extend mtk-sysirq to deal with multiple MMIO regions
- ACPI/IORT support for GICv3 ITS platform MSI
- ACPI support for mbigen
- Add mtk-cirq wakeup interrupt controller driver
- Atmel aic5 suspend support
- Allow GPCv2 to be probed both as an irqchip and a device
Diffstat (limited to 'fs/ext4/inline.c')
| -rw-r--r-- | fs/ext4/inline.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/fs/ext4/inline.c b/fs/ext4/inline.c index 30a9f210d1e3..375fb1c05d49 100644 --- a/fs/ext4/inline.c +++ b/fs/ext4/inline.c @@ -1169,10 +1169,9 @@ static int ext4_finish_convert_inline_dir(handle_t *handle, set_buffer_uptodate(dir_block); err = ext4_handle_dirty_dirent_node(handle, inode, dir_block); if (err) - goto out; + return err; set_buffer_verified(dir_block); -out: - return err; + return ext4_mark_inode_dirty(handle, inode); } static int ext4_convert_inline_data_nolock(handle_t *handle, |