From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH 3/4] btrfs-progs: check/original: Fix inode mode in subvolume trees
Date: Tue, 3 Sep 2019 16:24:06 +0800 [thread overview]
Message-ID: <20190903082407.13927-4-wqu@suse.com> (raw)
In-Reply-To: <20190903082407.13927-1-wqu@suse.com>
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 | 32 +++++++++++++++++++++++---------
check/mode-common.c | 4 ++--
check/mode-common.h | 2 ++
3 files changed, 27 insertions(+), 11 deletions(-)
diff --git a/check/main.c b/check/main.c
index 2e16b4e6f05b..8987d13c72e0 100644
--- a/check/main.c
+++ b/check/main.c
@@ -2771,18 +2771,31 @@ 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 {
+ detect_imode(root, path, &imode);
+ /* Ignore error returned, just use the default value returned */
+ }
+ btrfs_release_path(path);
ret = reset_imode(trans, root, path, rec->ino, imode);
if (ret < 0)
return ret;
@@ -2810,7 +2823,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 807d7daf98a6..ab451749e20c 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -836,8 +836,8 @@ int reset_imode(struct btrfs_trans_handle *trans, struct btrfs_root *root,
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 161b84a8deb0..67db89f20edb 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
next prev parent reply other threads:[~2019-09-03 8:24 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-03 8:24 [PATCH 0/4] btrfs-progs: check: Repair invalid inode mode in subvolume trees Qu Wenruo
2019-09-03 8:24 ` [PATCH 1/4] btrfs-progs: check/common: Make repair_imode_common() to handle inodes " Qu Wenruo
2019-09-04 7:37 ` Nikolay Borisov
2019-09-04 8:30 ` Qu Wenruo
2019-09-04 10:53 ` Nikolay Borisov
2019-09-04 12:12 ` Qu Wenruo
2019-09-03 8:24 ` [PATCH 2/4] btrfs-progs: check/lowmem: Repair bad imode early Qu Wenruo
2019-09-03 8:24 ` Qu Wenruo [this message]
2019-09-03 8:24 ` [PATCH 4/4] btrfs-progs: tests/fsck: Add new images for inode mode repair functionality Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20190903082407.13927-4-wqu@suse.com \
--to=wqu@suse.com \
--cc=linux-btrfs@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.