projects / thirdparty / kernel / stable-queue.git / blame
| Commit | Line | Data |
|---|---|---|
| ca7df5f3 GKH |
1 | From 3e67cfad22230ebed85c56cbe413876f33fea82b Mon Sep 17 00:00:00 2001 |
| 2 | From: Dmitry Monakhov <dmonakhov@openvz.org> | |
| 3 | Date: Fri, 3 Oct 2014 12:47:23 -0400 | |
| 4 | Subject: ext4: grab missed write_count for EXT4_IOC_SWAP_BOOT | |
| 5 | ||
| 6 | From: Dmitry Monakhov <dmonakhov@openvz.org> | |
| 7 | ||
| 8 | commit 3e67cfad22230ebed85c56cbe413876f33fea82b upstream. | |
| 9 | ||
| 10 | Otherwise this provokes complain like follows: | |
| 11 | WARNING: CPU: 12 PID: 5795 at fs/ext4/ext4_jbd2.c:48 ext4_journal_check_start+0x4e/0xa0() | |
| 12 | Modules linked in: brd iTCO_wdt lpc_ich mfd_core igb ptp dm_mirror dm_region_hash dm_log dm_mod | |
| 13 | CPU: 12 PID: 5795 Comm: python Not tainted 3.17.0-rc2-00175-gae5344f #158 | |
| 14 | Hardware name: Intel Corporation W2600CR/W2600CR, BIOS SE5C600.86B.99.99.x028.061320111235 06/13/2011 | |
| 15 | 0000000000000030 ffff8808116cfd28 ffffffff815c7dfc 0000000000000030 | |
| 16 | 0000000000000000 ffff8808116cfd68 ffffffff8106ce8c ffff8808116cfdc8 | |
| 17 | ffff880813b16000 ffff880806ad6ae8 ffffffff81202008 0000000000000000 | |
| 18 | Call Trace: | |
| 19 | [<ffffffff815c7dfc>] dump_stack+0x51/0x6d | |
| 20 | [<ffffffff8106ce8c>] warn_slowpath_common+0x8c/0xc0 | |
| 21 | [<ffffffff81202008>] ? ext4_ioctl+0x9e8/0xeb0 | |
| 22 | [<ffffffff8106ceda>] warn_slowpath_null+0x1a/0x20 | |
| 23 | [<ffffffff8122867e>] ext4_journal_check_start+0x4e/0xa0 | |
| 24 | [<ffffffff81228c10>] __ext4_journal_start_sb+0x90/0x110 | |
| 25 | [<ffffffff81202008>] ext4_ioctl+0x9e8/0xeb0 | |
| 26 | [<ffffffff8107b0bd>] ? ptrace_stop+0x24d/0x2f0 | |
| 27 | [<ffffffff81088530>] ? alloc_pid+0x480/0x480 | |
| 28 | [<ffffffff8107b1f2>] ? ptrace_do_notify+0x92/0xb0 | |
| 29 | [<ffffffff81186545>] do_vfs_ioctl+0x4e5/0x550 | |
| 30 | [<ffffffff815cdbcb>] ? _raw_spin_unlock_irq+0x2b/0x40 | |
| 31 | [<ffffffff81186603>] SyS_ioctl+0x53/0x80 | |
| 32 | [<ffffffff815ce2ce>] tracesys+0xd0/0xd5 | |
| 33 | ||
| 34 | Reviewed-by: Jan Kara <jack@suse.cz> | |
| 35 | Signed-off-by: Dmitry Monakhov <dmonakhov@openvz.org> | |
| 36 | Signed-off-by: Theodore Ts'o <tytso@mit.edu> | |
| 37 | Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org> | |
| 38 | ||
| 39 | --- | |
| 40 | fs/ext4/ioctl.c | 10 +++++++++- | |
| 41 | 1 file changed, 9 insertions(+), 1 deletion(-) | |
| 42 | ||
| 43 | --- a/fs/ext4/ioctl.c | |
| 44 | +++ b/fs/ext4/ioctl.c | |
| 45 | @@ -549,9 +549,17 @@ group_add_out: | |
| 46 | } | |
| 47 | ||
| 48 | case EXT4_IOC_SWAP_BOOT: | |
| 49 | + { | |
| 50 | + int err; | |
| 51 | if (!(filp->f_mode & FMODE_WRITE)) | |
| 52 | return -EBADF; | |
| 53 | - return swap_inode_boot_loader(sb, inode); | |
| 54 | + err = mnt_want_write_file(filp); | |
| 55 | + if (err) | |
| 56 | + return err; | |
| 57 | + err = swap_inode_boot_loader(sb, inode); | |
| 58 | + mnt_drop_write_file(filp); | |
| 59 | + return err; | |
| 60 | + } | |
| 61 | ||
| 62 | case EXT4_IOC_RESIZE_FS: { | |
| 63 | ext4_fsblk_t n_blocks_count; |