From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 5/6] btrfs-progs: check/original: Fix inode mode in subvolume trees
Date: Thu, 12 Sep 2019 11:11:34 +0800 [thread overview]
Message-ID: <20190912031135.79696-6-wqu@suse.com> (raw)
In-Reply-To: <20190912031135.79696-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().
- Free the path after reset_imode()
reset_imode() keeps the path, as lowmem mode uses path to locate its
current check position.
But for original mode, the unreleased path can cause later repair to
report warning, so we need to manually release the path.
- Update rec->imode after imode reset
So later repair depending on rec->imode can get correct value.
- Move the repair before repair_inode_nlinks()
repair_inode_nlinks() needs correct imode to add DIR_INDEX/DIR_ITEM.
So moving the repair before repair_inode_nlinks() makes the latter
repair happier.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/main.c | 41 ++++++++++++++++++++++++++++++-----------
check/mode-common.c | 2 +-
check/mode-common.h | 2 ++
3 files changed, 33 insertions(+), 12 deletions(-)
diff --git a/check/main.c b/check/main.c
index 902279740589..8bdc9c69fa46 100644
--- a/check/main.c
+++ b/check/main.c
@@ -2756,22 +2756,40 @@ 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);
+ btrfs_release_path(path);
if (ret < 0)
return ret;
rec->errors &= ~I_ERR_INVALID_IMODE;
+ rec->imode = imode;
return ret;
}
@@ -2795,7 +2813,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;
/*
@@ -2812,6 +2831,8 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec)
btrfs_init_path(&path);
if (!ret && rec->errors & I_ERR_MISMATCH_DIR_HASH)
ret = repair_mismatch_dir_hash(trans, root, rec);
+ if (!ret && rec->errors & I_ERR_INVALID_IMODE)
+ ret = repair_imode_original(trans, root, &path, rec);
if (rec->errors & I_ERR_NO_INODE_ITEM)
ret = repair_inode_no_item(trans, root, &path, rec);
if (!ret && rec->errors & I_ERR_FILE_EXTENT_DISCOUNT)
@@ -2828,8 +2849,6 @@ static int try_repair_inode(struct btrfs_root *root, struct inode_record *rec)
ret = repair_inline_ram_bytes(trans, root, &path, rec);
if (!ret && rec->errors & I_ERR_UNALIGNED_EXTENT_REC)
ret = repair_unaligned_extent_recs(trans, root, &path, rec);
- if (!ret && rec->errors & I_ERR_INVALID_IMODE)
- ret = repair_imode_original(trans, root, &path, rec);
btrfs_commit_transaction(trans, root);
btrfs_release_path(&path);
return ret;
diff --git a/check/mode-common.c b/check/mode-common.c
index bc566e4aa03e..10ad6d228a03 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -965,7 +965,7 @@ static int find_file_type(struct btrfs_root *root, u64 ino, u64 dirid,
imode_ret);
}
-static int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
+int detect_imode(struct btrfs_root *root, struct btrfs_path *path,
u32 *imode_ret)
{
struct btrfs_key key;
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
next prev parent reply other threads:[~2019-09-12 3:11 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-09-12 3:11 [PATCH v2 0/6] btrfs-progs: check: Repair invalid inode mode in subvolume trees Qu Wenruo
2019-09-12 3:11 ` [PATCH v3 1/6] btrfs-progs: check: Export btrfs_type_to_imode Qu Wenruo
2019-09-24 8:41 ` Nikolay Borisov
2019-09-24 9:19 ` Qu WenRuo
2019-09-12 3:11 ` [PATCH v3 2/6] btrfs-progs: check/common: Introduce a function to find imode using info from INODE_REF item Qu Wenruo
2019-09-12 3:11 ` [PATCH v3 3/6] btrfs-progs: check/common: Make repair_imode_common() to handle inodes in subvolume trees Qu Wenruo
2019-09-12 3:11 ` [PATCH v3 4/6] btrfs-progs: check/lowmem: Repair bad imode early Qu Wenruo
2019-09-12 3:11 ` Qu Wenruo [this message]
2019-09-12 3:11 ` [PATCH v3 6/6] 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=20190912031135.79696-6-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).