Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-12-28 16:56:26 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

jbd2: remove the 'success' parameter from the jbd2_do_replay() function

Browse Source 
Keep 'success' internally to track if any error happened and then
return it at the end in do_one_pass(). If jbd2_do_replay() return
-ENOMEM then stop replay journal.

Signed-off-by: Ye Bin <yebin10@huawei.com>
Reviewed-by: Zhang Yi <yi.zhang@huawei.com>
Reviewed-by: Jan Kara <jack@suse.cz>
Link: https://patch.msgid.link/20240930005942.626942-7-yebin@huaweicloud.com
Signed-off-by: Theodore Ts'o <tytso@mit.edu>
This commit is contained in:
Ye Bin 2024-09-30 08:59:42 +08:00 committed by Theodore Ts'o
parent 0f67827bf4
commit 22d26f9b0c
1 changed files with 12 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
fs/jbd2/recovery.c
View File

@ -489,12 +489,11 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
struct recovery_info *info,
struct buffer_head *bh,
unsigned long *next_log_block,
unsigned int next_commit_ID,
int *success)
unsigned int next_commit_ID)
{
char *tagp;
int flags;
int err;
int ret = 0;
int tag_bytes = journal_tag_bytes(journal);
int descr_csum_size = 0;
unsigned long io_block;
@ -508,6 +507,7 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
tagp = &bh->b_data[sizeof(journal_header_t)];
while (tagp - bh->b_data + tag_bytes <=
journal->j_blocksize - descr_csum_size) {
int err;
memcpy(&tag, tagp, sizeof(tag));
flags = be16_to_cpu(tag.t_flags);
@ -517,7 +517,7 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
err = jread(&obh, journal, io_block);
if (err) {
/* Recover what we can, but report failure at the end. */
*success = err;
ret = err;
pr_err("JBD2: IO error %d recovering block %lu in log\n",
err, io_block);
} else {
@ -539,7 +539,7 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
(journal_block_tag3_t *)tagp,
obh->b_data, next_commit_ID)) {
brelse(obh);
*success = -EFSBADCRC;
ret = -EFSBADCRC;
pr_err("JBD2: Invalid checksum recovering data block %llu in journal block %lu\n",
blocknr, io_block);
goto skip_write;
@ -580,7 +580,7 @@ static __always_inline int jbd2_do_replay(journal_t *journal,
break;
}
return 0;
return ret;
}
static int do_one_pass(journal_t *journal,
@ -719,9 +719,12 @@ static int do_one_pass(journal_t *journal,
* done here!
*/
err = jbd2_do_replay(journal, info, bh, &next_log_block,
next_commit_ID, &success);
if (err)
goto failed;
next_commit_ID);
if (err) {
if (err == -ENOMEM)
goto failed;
success = err;
}
continue;