btrfs-progs: check: repair dir inode isize in lowmem mode
authorSu Yue <suy.fnst@cn.fujitsu.com>
Mon, 28 Aug 2017 03:20:34 +0000 (11:20 +0800)
committerDavid Sterba <dsterba@suse.com>
Mon, 16 Oct 2017 18:33:00 +0000 (20:33 +0200)
After traversal of whole directory, we should get the actual isize.

Like original mode, function repair_dir_isize_lowmem() sets isize of the
directory inode item to actual size.

Signed-off-by: Su Yue <suy.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
cmds-check.c

index 3c2f143..5828ba0 100644 (file)
@@ -5018,6 +5018,66 @@ out:
 }
 
 /*
+ * Set directory inode isize to @isize.
+ *
+ * Returns 0     on success.
+ * Returns != 0  on error.
+ */
+static int repair_dir_isize_lowmem(struct btrfs_root *root,
+                                  struct btrfs_path *path,
+                                  u64 ino, u64 isize)
+{
+       struct btrfs_trans_handle *trans;
+       struct btrfs_inode_item *ii;
+       struct btrfs_key key;
+       struct btrfs_key research_key;
+       int ret;
+       int err = 0;
+
+       btrfs_item_key_to_cpu(path->nodes[0], &research_key, path->slots[0]);
+
+       key.objectid = ino;
+       key.type = BTRFS_INODE_ITEM_KEY;
+       key.offset = 0;
+
+       trans = btrfs_start_transaction(root, 1);
+       if (IS_ERR(trans)) {
+               ret = PTR_ERR(trans);
+               err |= ret;
+               goto out;
+       }
+
+       btrfs_release_path(path);
+       ret = btrfs_search_slot(trans, root, &key, path, 0, 1);
+       if (ret > 0)
+               ret = -ENOENT;
+       if (ret) {
+               err |= ret;
+               goto fail;
+       }
+
+       ii = btrfs_item_ptr(path->nodes[0], path->slots[0],
+                           struct btrfs_inode_item);
+       btrfs_set_inode_size(path->nodes[0], ii, isize);
+       btrfs_mark_buffer_dirty(path->nodes[0]);
+fail:
+       btrfs_commit_transaction(trans, root);
+out:
+       if (ret)
+               error("failed to set isize in inode %llu root %llu",
+                     ino, root->root_key.objectid);
+       else
+               printf("Set isize in inode %llu root %llu to %llu\n",
+                      ino, root->root_key.objectid, isize);
+
+       btrfs_release_path(path);
+       ret = btrfs_search_slot(NULL, root, &research_key, path, 0, 0);
+       err |= ret;
+
+       return err;
+}
+
+/*
  * Check INODE_ITEM and related ITEMs (the same inode number)
  * 1. check link count
  * 2. check inode ref/extref
@@ -5152,9 +5212,15 @@ out:
                }
 
                if (isize != size) {
-                       err |= ISIZE_ERROR;
-                       error("root %llu DIR INODE [%llu] size(%llu) not equal to %llu",
-                             root->objectid, inode_id, isize, size);
+                       if (repair)
+                               ret = repair_dir_isize_lowmem(root, path,
+                                                             inode_id, size);
+                       if (!repair || ret) {
+                               err |= ISIZE_ERROR;
+                               error(
+               "root %llu DIR INODE [%llu] size %llu not equal to %llu",
+                                     root->objectid, inode_id, isize, size);
+                       }
                }
        } else {
                if (nlink != refs) {