diff options
| author | Zhihao Cheng <chengzhihao1@huawei.com> | 2024-11-11 17:08:00 +0800 |
|---|---|---|
| committer | David Oberhollenzer <david.oberhollenzer@sigma-star.at> | 2024-11-11 10:32:46 +0100 |
| commit | 7e9a7ceaa9d3851963f92f99ce012f7cd99e742b (patch) | |
| tree | a8d93b1a91fe899dce015148fac670d0e2326dd3 /ubifs-utils/fsck.ubifs/load_fs.c | |
| parent | acedb85997d7b04b4546154d8acc5d916c020630 (diff) | |
fsck.ubifs: Move common functions and data structures into fsck.ubifs.c
This is a preparation for adding TNC checking support. Following data
structures and functions are moved into fsck.ubifs.c:
1. Move 'scanned_files' and 'used_lebs' from rebuild module, make them
resuable for non-rebuild_fs modes.
2. Move function 'handle_error' from load_fs.c, it could be reused in
other steps.
3. Add new function ubifs_tnc_remove_node in libubifs, which could
remove index entry for a node by given position.
Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com>
Signed-off-by: David Oberhollenzer <david.oberhollenzer@sigma-star.at>
Diffstat (limited to 'ubifs-utils/fsck.ubifs/load_fs.c')
| -rw-r--r-- | ubifs-utils/fsck.ubifs/load_fs.c | 27 |
1 files changed, 0 insertions, 27 deletions
diff --git a/ubifs-utils/fsck.ubifs/load_fs.c b/ubifs-utils/fsck.ubifs/load_fs.c index 5854054..04208a1 100644 --- a/ubifs-utils/fsck.ubifs/load_fs.c +++ b/ubifs-utils/fsck.ubifs/load_fs.c @@ -17,33 +17,6 @@ #include "misc.h" #include "fsck.ubifs.h" -enum { HAS_DATA_CORRUPTED = 1, HAS_TNC_CORRUPTED = 2 }; - -static void handle_error(const struct ubifs_info *c, int reason_set) -{ - bool handled = false; - unsigned int reason = get_failure_reason_callback(c); - - clear_failure_reason_callback(c); - if ((reason_set & HAS_DATA_CORRUPTED) && (reason & FR_DATA_CORRUPTED)) { - handled = true; - reason &= ~FR_DATA_CORRUPTED; - if (fix_problem(c, LOG_CORRUPTED, NULL)) - FSCK(c)->try_rebuild = true; - } - if ((reason_set & HAS_TNC_CORRUPTED) && (reason & FR_TNC_CORRUPTED)) { - ubifs_assert(c, !handled); - handled = true; - reason &= ~FR_TNC_CORRUPTED; - if (fix_problem(c, TNC_CORRUPTED, NULL)) - FSCK(c)->try_rebuild = true; - } - - ubifs_assert(c, reason == 0); - if (!handled) - exit_code |= FSCK_ERROR; -} - int ubifs_load_filesystem(struct ubifs_info *c) { int err; |