diff options
| author | zhangyi (F) <yi.zhang@huawei.com> | 2019-12-04 20:46:14 +0800 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2020-06-24 17:50:48 +0200 |
| commit | 0804b23d2ff15f6656d70291d5e07677ca897881 (patch) | |
| tree | c1bf857428fe43c9207019c79c9c2fd1d66a7649 /include | |
| parent | ae3c09e346bdaf194e6cf5f2b74e29678937b038 (diff) | |
| download | linux-stable-0804b23d2ff15f6656d70291d5e07677ca897881.tar.gz linux-stable-0804b23d2ff15f6656d70291d5e07677ca897881.tar.bz2 linux-stable-0804b23d2ff15f6656d70291d5e07677ca897881.zip | |
jbd2: clean __jbd2_journal_abort_hard() and __journal_abort_soft()
[ Upstream commit 7f6225e446cc8dfa4c3c7959a4de3dd03ec277bf ]
__jbd2_journal_abort_hard() is no longer used, so now we can merge
__jbd2_journal_abort_hard() and __journal_abort_soft() these two
functions into jbd2_journal_abort() and remove them.
Signed-off-by: zhangyi (F) <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://lore.kernel.org/r/20191204124614.45424-5-yi.zhang@huawei.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'include')
| -rw-r--r-- | include/linux/jbd2.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/include/linux/jbd2.h b/include/linux/jbd2.h index 10e6049c0ba9..b0e97e5de8ca 100644 --- a/include/linux/jbd2.h +++ b/include/linux/jbd2.h @@ -1402,7 +1402,6 @@ extern int jbd2_journal_skip_recovery (journal_t *); extern void jbd2_journal_update_sb_errno(journal_t *); extern int jbd2_journal_update_sb_log_tail (journal_t *, tid_t, unsigned long, int); -extern void __jbd2_journal_abort_hard (journal_t *); extern void jbd2_journal_abort (journal_t *, int); extern int jbd2_journal_errno (journal_t *); extern void jbd2_journal_ack_err (journal_t *); |