diff options
-rw-r--r-- | fs/ext4/ext4_jbd2.c | 3 | ||||
-rw-r--r-- | fs/ext4/ext4_jbd2.h | 7 | ||||
-rw-r--r-- | fs/ext4/inode.c | 2 | ||||
-rw-r--r-- | fs/ext4/namei.c | 4 | ||||
-rw-r--r-- | fs/ext4/resize.c | 2 |
5 files changed, 7 insertions, 11 deletions
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index c19ab6addb24..bfa65b49d424 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c | |||
@@ -138,8 +138,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, | |||
138 | } | 138 | } |
139 | 139 | ||
140 | int __ext4_handle_dirty_super(const char *where, unsigned int line, | 140 | int __ext4_handle_dirty_super(const char *where, unsigned int line, |
141 | handle_t *handle, struct super_block *sb, | 141 | handle_t *handle, struct super_block *sb) |
142 | int now) | ||
143 | { | 142 | { |
144 | struct buffer_head *bh = EXT4_SB(sb)->s_sbh; | 143 | struct buffer_head *bh = EXT4_SB(sb)->s_sbh; |
145 | int err = 0; | 144 | int err = 0; |
diff --git a/fs/ext4/ext4_jbd2.h b/fs/ext4/ext4_jbd2.h index 1393c8304116..56d258c18303 100644 --- a/fs/ext4/ext4_jbd2.h +++ b/fs/ext4/ext4_jbd2.h | |||
@@ -219,8 +219,7 @@ int __ext4_handle_dirty_metadata(const char *where, unsigned int line, | |||
219 | struct buffer_head *bh); | 219 | struct buffer_head *bh); |
220 | 220 | ||
221 | int __ext4_handle_dirty_super(const char *where, unsigned int line, | 221 | int __ext4_handle_dirty_super(const char *where, unsigned int line, |
222 | handle_t *handle, struct super_block *sb, | 222 | handle_t *handle, struct super_block *sb); |
223 | int now); | ||
224 | 223 | ||
225 | #define ext4_journal_get_write_access(handle, bh) \ | 224 | #define ext4_journal_get_write_access(handle, bh) \ |
226 | __ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh)) | 225 | __ext4_journal_get_write_access(__func__, __LINE__, (handle), (bh)) |
@@ -232,10 +231,8 @@ int __ext4_handle_dirty_super(const char *where, unsigned int line, | |||
232 | #define ext4_handle_dirty_metadata(handle, inode, bh) \ | 231 | #define ext4_handle_dirty_metadata(handle, inode, bh) \ |
233 | __ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \ | 232 | __ext4_handle_dirty_metadata(__func__, __LINE__, (handle), (inode), \ |
234 | (bh)) | 233 | (bh)) |
235 | #define ext4_handle_dirty_super_now(handle, sb) \ | ||
236 | __ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 1) | ||
237 | #define ext4_handle_dirty_super(handle, sb) \ | 234 | #define ext4_handle_dirty_super(handle, sb) \ |
238 | __ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb), 0) | 235 | __ext4_handle_dirty_super(__func__, __LINE__, (handle), (sb)) |
239 | 236 | ||
240 | handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks); | 237 | handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks); |
241 | int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle); | 238 | int __ext4_journal_stop(const char *where, unsigned int line, handle_t *handle); |
diff --git a/fs/ext4/inode.c b/fs/ext4/inode.c index bed574dd4c22..a533a18de98e 100644 --- a/fs/ext4/inode.c +++ b/fs/ext4/inode.c | |||
@@ -4093,7 +4093,7 @@ static int ext4_do_update_inode(handle_t *handle, | |||
4093 | EXT4_SET_RO_COMPAT_FEATURE(sb, | 4093 | EXT4_SET_RO_COMPAT_FEATURE(sb, |
4094 | EXT4_FEATURE_RO_COMPAT_LARGE_FILE); | 4094 | EXT4_FEATURE_RO_COMPAT_LARGE_FILE); |
4095 | ext4_handle_sync(handle); | 4095 | ext4_handle_sync(handle); |
4096 | err = ext4_handle_dirty_super_now(handle, sb); | 4096 | err = ext4_handle_dirty_super(handle, sb); |
4097 | } | 4097 | } |
4098 | } | 4098 | } |
4099 | raw_inode->i_generation = cpu_to_le32(inode->i_generation); | 4099 | raw_inode->i_generation = cpu_to_le32(inode->i_generation); |
diff --git a/fs/ext4/namei.c b/fs/ext4/namei.c index 0edaf18d843e..37faf56e558d 100644 --- a/fs/ext4/namei.c +++ b/fs/ext4/namei.c | |||
@@ -2397,7 +2397,7 @@ int ext4_orphan_add(handle_t *handle, struct inode *inode) | |||
2397 | /* Insert this inode at the head of the on-disk orphan list... */ | 2397 | /* Insert this inode at the head of the on-disk orphan list... */ |
2398 | NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan); | 2398 | NEXT_ORPHAN(inode) = le32_to_cpu(EXT4_SB(sb)->s_es->s_last_orphan); |
2399 | EXT4_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino); | 2399 | EXT4_SB(sb)->s_es->s_last_orphan = cpu_to_le32(inode->i_ino); |
2400 | err = ext4_handle_dirty_super_now(handle, sb); | 2400 | err = ext4_handle_dirty_super(handle, sb); |
2401 | rc = ext4_mark_iloc_dirty(handle, inode, &iloc); | 2401 | rc = ext4_mark_iloc_dirty(handle, inode, &iloc); |
2402 | if (!err) | 2402 | if (!err) |
2403 | err = rc; | 2403 | err = rc; |
@@ -2470,7 +2470,7 @@ int ext4_orphan_del(handle_t *handle, struct inode *inode) | |||
2470 | if (err) | 2470 | if (err) |
2471 | goto out_brelse; | 2471 | goto out_brelse; |
2472 | sbi->s_es->s_last_orphan = cpu_to_le32(ino_next); | 2472 | sbi->s_es->s_last_orphan = cpu_to_le32(ino_next); |
2473 | err = ext4_handle_dirty_super_now(handle, inode->i_sb); | 2473 | err = ext4_handle_dirty_super(handle, inode->i_sb); |
2474 | } else { | 2474 | } else { |
2475 | struct ext4_iloc iloc2; | 2475 | struct ext4_iloc iloc2; |
2476 | struct inode *i_prev = | 2476 | struct inode *i_prev = |
diff --git a/fs/ext4/resize.c b/fs/ext4/resize.c index 50530bdbc02a..41f6ef68e2e1 100644 --- a/fs/ext4/resize.c +++ b/fs/ext4/resize.c | |||
@@ -798,7 +798,7 @@ static int add_new_gdb(handle_t *handle, struct inode *inode, | |||
798 | ext4_kvfree(o_group_desc); | 798 | ext4_kvfree(o_group_desc); |
799 | 799 | ||
800 | le16_add_cpu(&es->s_reserved_gdt_blocks, -1); | 800 | le16_add_cpu(&es->s_reserved_gdt_blocks, -1); |
801 | err = ext4_handle_dirty_super_now(handle, sb); | 801 | err = ext4_handle_dirty_super(handle, sb); |
802 | if (err) | 802 | if (err) |
803 | ext4_std_error(sb, err); | 803 | ext4_std_error(sb, err); |
804 | 804 | ||