| Message ID | 20230217100922.588961-3-libaokun1@huawei.com |
|---|---|
| State | Accepted |
| Headers | show |
| Series | e2fsprogs: avoid error information loss during journal replay | expand |
On Fri 17-02-23 18:09:22, Baokun Li wrote: > Saving error information during journal replay, as in the kernel, > prevents information loss from making problems difficult to locate. > We save these error information until someone uses e2fsck to check > for and fix possible errors. > > Signed-off-by: Baokun Li <libaokun1@huawei.com> Looks good to me. Feel free to add: Reviewed-by: Jan Kara <jack@suse.cz> Honza > --- > debugfs/journal.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/debugfs/journal.c b/debugfs/journal.c > index 5bac0d3b..79e3fff8 100644 > --- a/debugfs/journal.c > +++ b/debugfs/journal.c > @@ -789,6 +789,8 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > char *fsname; > int fsflags; > int fsblocksize; > + char *save; > + __u16 s_error_state; > > if (!(fs->flags & EXT2_FLAG_RW)) > return EXT2_ET_FILE_RO; > @@ -808,6 +810,12 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > if (stats && stats->bytes_written) > kbytes_written = stats->bytes_written >> 10; > > + save = malloc(EXT4_S_ERR_LEN); > + if (save) > + memcpy(save, ((char *) fs->super) + EXT4_S_ERR_START, > + EXT4_S_ERR_LEN); > + s_error_state = fs->super->s_state & EXT2_ERROR_FS; > + > ext2fs_mmp_stop(fs); > fsname = fs->device_name; > fs->device_name = NULL; > @@ -818,11 +826,15 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > retval = ext2fs_open(fsname, fsflags, 0, fsblocksize, io_ptr, fsp); > ext2fs_free_mem(&fsname); > if (retval) > - return retval; > + goto outfree; > > fs = *fsp; > fs->flags |= EXT2_FLAG_MASTER_SB_ONLY; > fs->super->s_kbytes_written += kbytes_written; > + fs->super->s_state |= s_error_state; > + if (save) > + memcpy(((char *) fs->super) + EXT4_S_ERR_START, save, > + EXT4_S_ERR_LEN); > > /* Set the superblock flags */ > ext2fs_clear_recover(fs, recover_retval != 0); > @@ -832,6 +844,9 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > * the EXT2_ERROR_FS flag in the fs superblock if needed. > */ > retval = ext2fs_check_ext3_journal(fs); > + > +outfree: > + free(save); > return retval ? retval : recover_retval; > } > > -- > 2.31.1 >
On 2023/2/17 18:09, Baokun Li wrote: > Saving error information during journal replay, as in the kernel, > prevents information loss from making problems difficult to locate. > We save these error information until someone uses e2fsck to check > for and fix possible errors. > > Signed-off-by: Baokun Li <libaokun1@huawei.com> Looks good to me. Feel free to add: Reviewed-by: zhanchengbin <zhanchengbin1@huawei.com> - bin. > --- > debugfs/journal.c | 17 ++++++++++++++++- > 1 file changed, 16 insertions(+), 1 deletion(-) > > diff --git a/debugfs/journal.c b/debugfs/journal.c > index 5bac0d3b..79e3fff8 100644 > --- a/debugfs/journal.c > +++ b/debugfs/journal.c > @@ -789,6 +789,8 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > char *fsname; > int fsflags; > int fsblocksize; > + char *save; > + __u16 s_error_state; > > if (!(fs->flags & EXT2_FLAG_RW)) > return EXT2_ET_FILE_RO; > @@ -808,6 +810,12 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > if (stats && stats->bytes_written) > kbytes_written = stats->bytes_written >> 10; > > + save = malloc(EXT4_S_ERR_LEN); > + if (save) > + memcpy(save, ((char *) fs->super) + EXT4_S_ERR_START, > + EXT4_S_ERR_LEN); > + s_error_state = fs->super->s_state & EXT2_ERROR_FS; > + > ext2fs_mmp_stop(fs); > fsname = fs->device_name; > fs->device_name = NULL; > @@ -818,11 +826,15 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > retval = ext2fs_open(fsname, fsflags, 0, fsblocksize, io_ptr, fsp); > ext2fs_free_mem(&fsname); > if (retval) > - return retval; > + goto outfree; > > fs = *fsp; > fs->flags |= EXT2_FLAG_MASTER_SB_ONLY; > fs->super->s_kbytes_written += kbytes_written; > + fs->super->s_state |= s_error_state; > + if (save) > + memcpy(((char *) fs->super) + EXT4_S_ERR_START, save, > + EXT4_S_ERR_LEN); > > /* Set the superblock flags */ > ext2fs_clear_recover(fs, recover_retval != 0); > @@ -832,6 +844,9 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) > * the EXT2_ERROR_FS flag in the fs superblock if needed. > */ > retval = ext2fs_check_ext3_journal(fs); > + > +outfree: > + free(save); > return retval ? retval : recover_retval; > } > >
diff --git a/debugfs/journal.c b/debugfs/journal.c index 5bac0d3b..79e3fff8 100644 --- a/debugfs/journal.c +++ b/debugfs/journal.c @@ -789,6 +789,8 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) char *fsname; int fsflags; int fsblocksize; + char *save; + __u16 s_error_state; if (!(fs->flags & EXT2_FLAG_RW)) return EXT2_ET_FILE_RO; @@ -808,6 +810,12 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) if (stats && stats->bytes_written) kbytes_written = stats->bytes_written >> 10; + save = malloc(EXT4_S_ERR_LEN); + if (save) + memcpy(save, ((char *) fs->super) + EXT4_S_ERR_START, + EXT4_S_ERR_LEN); + s_error_state = fs->super->s_state & EXT2_ERROR_FS; + ext2fs_mmp_stop(fs); fsname = fs->device_name; fs->device_name = NULL; @@ -818,11 +826,15 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) retval = ext2fs_open(fsname, fsflags, 0, fsblocksize, io_ptr, fsp); ext2fs_free_mem(&fsname); if (retval) - return retval; + goto outfree; fs = *fsp; fs->flags |= EXT2_FLAG_MASTER_SB_ONLY; fs->super->s_kbytes_written += kbytes_written; + fs->super->s_state |= s_error_state; + if (save) + memcpy(((char *) fs->super) + EXT4_S_ERR_START, save, + EXT4_S_ERR_LEN); /* Set the superblock flags */ ext2fs_clear_recover(fs, recover_retval != 0); @@ -832,6 +844,9 @@ errcode_t ext2fs_run_ext3_journal(ext2_filsys *fsp) * the EXT2_ERROR_FS flag in the fs superblock if needed. */ retval = ext2fs_check_ext3_journal(fs); + +outfree: + free(save); return retval ? retval : recover_retval; }
Saving error information during journal replay, as in the kernel, prevents information loss from making problems difficult to locate. We save these error information until someone uses e2fsck to check for and fix possible errors. Signed-off-by: Baokun Li <libaokun1@huawei.com> --- debugfs/journal.c | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-)