diff options
Diffstat (limited to 'fs/ext4')
-rw-r--r-- | fs/ext4/ext4.h | 4 | ||||
-rw-r--r-- | fs/ext4/ext4_jbd2.c | 4 | ||||
-rw-r--r-- | fs/ext4/super.c | 11 |
3 files changed, 10 insertions, 9 deletions
diff --git a/fs/ext4/ext4.h b/fs/ext4/ext4.h index 3864a2775458..d8ec824f5a25 100644 --- a/fs/ext4/ext4.h +++ b/fs/ext4/ext4.h | |||
@@ -1629,8 +1629,10 @@ extern void ext4_error_inode(const char *, struct inode *, const char *, ...) | |||
1629 | extern void ext4_error_file(const char *, struct file *, const char *, ...) | 1629 | extern void ext4_error_file(const char *, struct file *, const char *, ...) |
1630 | __attribute__ ((format (printf, 3, 4))); | 1630 | __attribute__ ((format (printf, 3, 4))); |
1631 | extern void __ext4_std_error(struct super_block *, const char *, int); | 1631 | extern void __ext4_std_error(struct super_block *, const char *, int); |
1632 | extern void ext4_abort(struct super_block *, const char *, const char *, ...) | 1632 | extern void __ext4_abort(struct super_block *, const char *, const char *, ...) |
1633 | __attribute__ ((format (printf, 3, 4))); | 1633 | __attribute__ ((format (printf, 3, 4))); |
1634 | #define ext4_abort(sb, message...) __ext4_abort(sb, __func__, \ | ||
1635 | ## message) | ||
1634 | extern void __ext4_warning(struct super_block *, const char *, | 1636 | extern void __ext4_warning(struct super_block *, const char *, |
1635 | const char *, ...) | 1637 | const char *, ...) |
1636 | __attribute__ ((format (printf, 3, 4))); | 1638 | __attribute__ ((format (printf, 3, 4))); |
diff --git a/fs/ext4/ext4_jbd2.c b/fs/ext4/ext4_jbd2.c index cfd27b38fa15..df26a015d043 100644 --- a/fs/ext4/ext4_jbd2.c +++ b/fs/ext4/ext4_jbd2.c | |||
@@ -93,8 +93,8 @@ int __ext4_forget(const char *where, handle_t *handle, int is_metadata, | |||
93 | err = jbd2_journal_revoke(handle, blocknr, bh); | 93 | err = jbd2_journal_revoke(handle, blocknr, bh); |
94 | if (err) { | 94 | if (err) { |
95 | ext4_journal_abort_handle(where, __func__, bh, handle, err); | 95 | ext4_journal_abort_handle(where, __func__, bh, handle, err); |
96 | ext4_abort(inode->i_sb, __func__, | 96 | __ext4_abort(inode->i_sb, where, |
97 | "error %d when attempting revoke", err); | 97 | "error %d when attempting revoke", err); |
98 | } | 98 | } |
99 | BUFFER_TRACE(bh, "exit"); | 99 | BUFFER_TRACE(bh, "exit"); |
100 | return err; | 100 | return err; |
diff --git a/fs/ext4/super.c b/fs/ext4/super.c index 422a4ce66778..11441e483b62 100644 --- a/fs/ext4/super.c +++ b/fs/ext4/super.c | |||
@@ -248,7 +248,7 @@ handle_t *ext4_journal_start_sb(struct super_block *sb, int nblocks) | |||
248 | journal = EXT4_SB(sb)->s_journal; | 248 | journal = EXT4_SB(sb)->s_journal; |
249 | if (journal) { | 249 | if (journal) { |
250 | if (is_journal_aborted(journal)) { | 250 | if (is_journal_aborted(journal)) { |
251 | ext4_abort(sb, __func__, "Detected aborted journal"); | 251 | ext4_abort(sb, "Detected aborted journal"); |
252 | return ERR_PTR(-EROFS); | 252 | return ERR_PTR(-EROFS); |
253 | } | 253 | } |
254 | return jbd2_journal_start(journal, nblocks); | 254 | return jbd2_journal_start(journal, nblocks); |
@@ -464,8 +464,8 @@ void __ext4_std_error(struct super_block *sb, const char *function, int errno) | |||
464 | * case we take the easy way out and panic immediately. | 464 | * case we take the easy way out and panic immediately. |
465 | */ | 465 | */ |
466 | 466 | ||
467 | void ext4_abort(struct super_block *sb, const char *function, | 467 | void __ext4_abort(struct super_block *sb, const char *function, |
468 | const char *fmt, ...) | 468 | const char *fmt, ...) |
469 | { | 469 | { |
470 | va_list args; | 470 | va_list args; |
471 | 471 | ||
@@ -660,8 +660,7 @@ static void ext4_put_super(struct super_block *sb) | |||
660 | err = jbd2_journal_destroy(sbi->s_journal); | 660 | err = jbd2_journal_destroy(sbi->s_journal); |
661 | sbi->s_journal = NULL; | 661 | sbi->s_journal = NULL; |
662 | if (err < 0) | 662 | if (err < 0) |
663 | ext4_abort(sb, __func__, | 663 | ext4_abort(sb, "Couldn't clean up the journal"); |
664 | "Couldn't clean up the journal"); | ||
665 | } | 664 | } |
666 | 665 | ||
667 | ext4_release_system_zone(sb); | 666 | ext4_release_system_zone(sb); |
@@ -3605,7 +3604,7 @@ static int ext4_remount(struct super_block *sb, int *flags, char *data) | |||
3605 | } | 3604 | } |
3606 | 3605 | ||
3607 | if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) | 3606 | if (sbi->s_mount_flags & EXT4_MF_FS_ABORTED) |
3608 | ext4_abort(sb, __func__, "Abort forced by user"); | 3607 | ext4_abort(sb, "Abort forced by user"); |
3609 | 3608 | ||
3610 | sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | | 3609 | sb->s_flags = (sb->s_flags & ~MS_POSIXACL) | |
3611 | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); | 3610 | (test_opt(sb, POSIX_ACL) ? MS_POSIXACL : 0); |