[PATCH v2 5/6] btrfs-progs: check/original: Fix inode mode in subvolume trees

Qu Wenruo
2019-09-05T07:58:21Z

To make original mode to repair imode error in subvolume trees, this
patch will do:
- Remove the show-stopper checks for root->objectid.
Now repair_imode_original() will accept inodes in subvolume trees.

- Export detect_imode() for original mode
Due to the call requirement, original mode must use an existing trans
handler to do the repair, thus we need to re-implement most of the
work done in repair_imode_common().

- Make repair_imode_original() to use detect_imode.

Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/main.c | 35 ++++++++++++++++++++++++++---------
check/mode-common.c | 4 ++--
check/mode-common.h | 2 ++
3 files changed, 30 insertions(+), 11 deletions(-)

diff --git a/check/main.c b/check/main.c
index 902279740589..11d296b19ab9 100644
--- a/check/main.c
+++ b/check/main.c
@@ -2756,18 +2756,34 @@ static int repair_imode_original(struct btrfs_trans_handle *trans,
struct btrfs_path *path,
struct inode_record *rec)
{
+ struct btrfs_key key;
int ret;
u32 imode;

- if (root->root_key.objectid != BTRFS_ROOT_TREE_OBJECTID)
- return -ENOTTY;
- if (rec->ino != BTRFS_ROOT_TREE_DIR_OBJECTID || !is_fstree(rec->ino))
- return -ENOTTY;
+ key.objectid = rec->ino;
+ key.type = BTRFS_INODE_ITEM_KEY;
+ key.offset = 0;

- if (rec->ino == BTRFS_ROOT_TREE_DIR_OBJECTID)
- imode = 040755;
- else
- imode = 0100600;
+ ret = btrfs_search_slot(NULL, root, &key, path, 0, 0);
+ if (ret > 0)
+ ret = -ENOENT;
+ if (ret < 0)
+ return ret;
+
+ if (root->objectid == BTRFS_ROOT_TREE_OBJECTID) {
+ /* In root tree we only have two possible imode */
+ if (rec->ino == BTRFS_ROOT_TREE_OBJECTID)
+ imode = S_IFDIR | 0755;
+ else
+ imode = S_IFREG | 0600;
+ } else {
+ ret = detect_imode(root, path, &imode);
+ if (ret < 0) {
+ btrfs_release_path(path);
+ return ret;
+ }
+ }
+ btrfs_release_path(path);
ret = reset_imode(trans, root, path, rec->ino, imode);
if (ret < 0)
return ret;
@@ -2795,7 +2811,8 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec)
I_ERR_FILE_NBYTES_WRONG |
I_ERR_INLINE_RAM_BYTES_WRONG |
I_ERR_MISMATCH_DIR_HASH |
- I_ERR_UNALIGNED_EXTENT_REC)))
+ I_ERR_UNALIGNED_EXTENT_REC |
+ I_ERR_INVALID_IMODE)))
return rec->errors;

/*
diff --git a/check/mode-common.c b/check/mode-common.c
index abea2ceda4c4..d0a6917ea863 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -935,8 +935,8 @@ out:
return ret;
}

-static int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
- u32 *imode_ret)
+int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
+ u32 *imode_ret)
{
struct btrfs_key key;
struct btrfs_inode_item iitem;
diff --git a/check/mode-common.h b/check/mode-common.h
index 6c8d6d7578a6..edf9257edaf0 100644
--- a/check/mode-common.h
+++ b/check/mode-common.h
@@ -126,6 +126,8 @@ int delete_corrupted_dir_item(struct btrfs_trans_handle *trans,
struct btrfs_root *root,
struct btrfs_key *di_key, char *namebuf,
u32 namelen);
+int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
+ u32 *imode_ret);
int reset_imode(struct btrfs_trans_handle *trans, struct btrfs_root *root,
struct btrfs_path *path, u64 ino, u32 mode);
int repair_imode_common(struct btrfs_root *root, struct btrfs_path *path);
--
2.23.0