@@ -37,12 +37,18 @@ static int init_repair_info(struct ubifs_info *c)
return -ENOMEM;
c->repair->scanned_files = RB_ROOT;
+ c->repair->used_lebs = bitmap_zalloc(c->main_lebs, GFP_KERNEL);
+ if (!c->repair->used_lebs) {
+ kfree(c->repair);
+ return -ENOMEM;
+ }
return 0;
}
static void destroy_repair_info(struct ubifs_info *c)
{
+ bitmap_free(c->repair->used_lebs);
kfree(c->repair);
}
@@ -1020,6 +1026,9 @@ static void remove_del_nodes(struct ubifs_info *c, struct scanned_info *si)
valid_ino_node = lookup_valid_ino_node(c, si, del_ino_node);
if (valid_ino_node) {
+ int lnum = del_ino_node->header.lnum;
+
+ set_bit(lnum - c->main_first, c->repair->used_lebs);
rb_erase(&valid_ino_node->rb, &si->valid_inos);
kfree(valid_ino_node);
}
@@ -1036,6 +1045,9 @@ static void remove_del_nodes(struct ubifs_info *c, struct scanned_info *si)
valid_dent_node = lookup_valid_dent_node(c, si, del_dent_node);
if (valid_dent_node) {
+ int lnum = del_dent_node->header.lnum;
+
+ set_bit(lnum - c->main_first, c->repair->used_lebs);
rb_erase(&valid_dent_node->rb, &si->valid_dents);
kfree(valid_dent_node);
}
@@ -1710,6 +1722,82 @@ static int check_and_correct_files(struct ubifs_info *c)
return 0;
}
+static char *get_file_name(struct ubifs_info *c, struct scanned_file *file)
+{
+ static char name[UBIFS_MAX_NLEN + 1];
+ struct rb_node *node;
+ struct scanned_dent_node *dent_node;
+
+ node = rb_first(&file->dent_nodes);
+ if (!node) {
+ ubifs_assert(c, file->inum == UBIFS_ROOT_INO);
+ return "/";
+ }
+
+ if (c->encrypted && !file->ino.is_xattr)
+ /* Encrypted file name. */
+ return "<encrypted>";
+
+ /* Get name from any one dentry. */
+ dent_node = rb_entry(node, struct scanned_dent_node, rb);
+ memcpy(name, dent_node->name, dent_node->nlen);
+ /* @dent->name could be non '\0' terminated. */
+ name[dent_node->nlen] = '\0';
+ return name;
+}
+
+/**
+ * record_used_lebs - record used LEBs.
+ * @c: UBIFS file-system description object
+ *
+ * This function records all used LEBs which may hold useful nodes, then left
+ * unused LEBs could be taken for storing new index tree.
+ */
+static void record_used_lebs(struct ubifs_info *c)
+{
+ int lnum;
+ struct rb_node *node, *n;
+ struct scanned_file *file;
+ struct scanned_dent_node *dent_node;
+ struct scanned_data_node *data_node;
+
+ for (node = rb_first(&c->repair->scanned_files); node;
+ node = rb_next(node)) {
+ cond_resched();
+ file = rb_entry(node, struct scanned_file, rb);
+
+ dbg_repair("recovered file(inum:%lu name:%s type:%s), in ubi%d_%d",
+ file->inum, get_file_name(c, file),
+ file->ino.is_xattr ? "xattr" :
+ ubifs_get_type_name(ubifs_get_dent_type(file->ino.mode)),
+ c->vi.ubi_num, c->vi.vol_id);
+
+ lnum = file->ino.header.lnum;
+ set_bit(lnum - c->main_first, c->repair->used_lebs);
+
+ if (file->trun.header.exist) {
+ lnum = file->trun.header.lnum;
+ set_bit(lnum - c->main_first, c->repair->used_lebs);
+ }
+
+ for (n = rb_first(&file->data_nodes); n; n = rb_next(n)) {
+ cond_resched();
+ data_node = rb_entry(n, struct scanned_data_node, rb);
+
+ lnum = data_node->header.lnum;
+ set_bit(lnum - c->main_first, c->repair->used_lebs);
+ }
+
+ for (n = rb_first(&file->dent_nodes); n; n = rb_next(n)) {
+ cond_resched();
+ dent_node = rb_entry(n, struct scanned_dent_node, rb);
+
+ lnum = dent_node->header.lnum;
+ set_bit(lnum - c->main_first, c->repair->used_lebs);
+ }
+ }
+}
+
static int do_repair(struct ubifs_info *c)
{
int err = 0;
@@ -1744,6 +1832,12 @@ static int do_repair(struct ubifs_info *c)
/* Step 7: Check & correct files' information. */
ubifs_msg(c, "Step 7: Check & correct file information");
err = check_and_correct_files(c);
+ if (err)
+ goto out;
+
+ /* Step 8: Record used LEBs. */
+ ubifs_msg(c, "Step 8: Record used LEBs");
+ record_used_lebs(c);
out:
destroy_scanned_info(c, &si);
@@ -153,9 +153,11 @@ struct scanned_file {
/**
* ubifs_repair_info - per-FS repairing information.
+ * @usen_lebs: a bitmap used for recording used lebs
* @scanned_files: tree of all scanned files
*/
struct ubifs_repair_info {
+ unsigned long *used_lebs;
struct rb_root scanned_files;
};
This is the 8/13 step of repairing. Record used LEBs which may hold useful nodes, then left unused LEBs could be taken for storing new index tree. Notice, LEB that contains effective nodes on deleted trees in step 2 is regarded as used. Signed-off-by: Zhihao Cheng <chengzhihao1@huawei.com> --- fs/ubifs/repair.c | 94 +++++++++++++++++++++++++++++++++++++++++++++++ fs/ubifs/repair.h | 2 + 2 files changed, 96 insertions(+)