diff options
Diffstat (limited to 'fs/ext4/ioctl.c')
-rw-r--r-- | fs/ext4/ioctl.c | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/fs/ext4/ioctl.c b/fs/ext4/ioctl.c index a567af161b06..a63dce2117b8 100644 --- a/fs/ext4/ioctl.c +++ b/fs/ext4/ioctl.c | |||
@@ -8,10 +8,10 @@ | |||
8 | */ | 8 | */ |
9 | 9 | ||
10 | #include <linux/fs.h> | 10 | #include <linux/fs.h> |
11 | #include <linux/jbd.h> | 11 | #include <linux/jbd2.h> |
12 | #include <linux/capability.h> | 12 | #include <linux/capability.h> |
13 | #include <linux/ext4_fs.h> | 13 | #include <linux/ext4_fs.h> |
14 | #include <linux/ext4_jbd.h> | 14 | #include <linux/ext4_jbd2.h> |
15 | #include <linux/time.h> | 15 | #include <linux/time.h> |
16 | #include <linux/compat.h> | 16 | #include <linux/compat.h> |
17 | #include <linux/smp_lock.h> | 17 | #include <linux/smp_lock.h> |
@@ -219,9 +219,9 @@ flags_err: | |||
219 | return -EFAULT; | 219 | return -EFAULT; |
220 | 220 | ||
221 | err = ext4_group_extend(sb, EXT4_SB(sb)->s_es, n_blocks_count); | 221 | err = ext4_group_extend(sb, EXT4_SB(sb)->s_es, n_blocks_count); |
222 | journal_lock_updates(EXT4_SB(sb)->s_journal); | 222 | jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal); |
223 | journal_flush(EXT4_SB(sb)->s_journal); | 223 | jbd2_journal_flush(EXT4_SB(sb)->s_journal); |
224 | journal_unlock_updates(EXT4_SB(sb)->s_journal); | 224 | jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal); |
225 | 225 | ||
226 | return err; | 226 | return err; |
227 | } | 227 | } |
@@ -241,9 +241,9 @@ flags_err: | |||
241 | return -EFAULT; | 241 | return -EFAULT; |
242 | 242 | ||
243 | err = ext4_group_add(sb, &input); | 243 | err = ext4_group_add(sb, &input); |
244 | journal_lock_updates(EXT4_SB(sb)->s_journal); | 244 | jbd2_journal_lock_updates(EXT4_SB(sb)->s_journal); |
245 | journal_flush(EXT4_SB(sb)->s_journal); | 245 | jbd2_journal_flush(EXT4_SB(sb)->s_journal); |
246 | journal_unlock_updates(EXT4_SB(sb)->s_journal); | 246 | jbd2_journal_unlock_updates(EXT4_SB(sb)->s_journal); |
247 | 247 | ||
248 | return err; | 248 | return err; |
249 | } | 249 | } |