From: Qu Wenruo <wqu@suse.com>
To: linux-btrfs@vger.kernel.org
Subject: [PATCH v3 2/6] btrfs-progs: check/common: Introduce a function to find imode using info from INODE_REF item
Date: Thu, 12 Sep 2019 11:11:31 +0800 [thread overview]
Message-ID: <20190912031135.79696-3-wqu@suse.com> (raw)
In-Reply-To: <20190912031135.79696-1-wqu@suse.com>
Introduce a function, find_file_type(), to find filetype using
info from INODE_REF, including dir_id from key index/name from
inode_ref_item.
This function will:
- Search DIR_INDEX first
DIR_INDEX is easier since there is only one item in it.
- Validate the DIR_INDEX item
If the DIR_INDEX is valid, use the filetype and call it a day.
- Search DIR_ITEM then
It needs extra iteration since it's possible to have hash collision.
- Validate the DIR_ITEM
If valid, call it a day. Or return -ENOENT;
This would be used as the primary method to determine the imode in later
imode repair code.
Signed-off-by: Qu Wenruo <wqu@suse.com>
---
check/mode-common.c | 129 ++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 129 insertions(+)
diff --git a/check/mode-common.c b/check/mode-common.c
index 195b6efaa7aa..9ccde5cdc2e5 100644
--- a/check/mode-common.c
+++ b/check/mode-common.c
@@ -16,6 +16,7 @@
#include <time.h>
#include "ctree.h"
+#include "hash.h"
#include "common/internal.h"
#include "common/messages.h"
#include "transaction.h"
@@ -836,6 +837,134 @@ int reset_imode(struct btrfs_trans_handle *trans, struct btrfs_root *root,
return ret;
}
+static int find_file_type_dir_index(struct btrfs_root *root, u64 ino, u64 dirid,
+ u64 index, const char *name, u32 name_len,
+ u32 *imode_ret)
+{
+ struct btrfs_path path;
+ struct btrfs_key key;
+ struct btrfs_key location;
+ struct btrfs_dir_item *di;
+ char namebuf[BTRFS_NAME_LEN] = {0};
+ bool found = false;
+ u8 filetype;
+ u32 len;
+ int ret;
+
+ btrfs_init_path(&path);
+ key.objectid = dirid;
+ key.offset = index;
+ key.type = BTRFS_DIR_INDEX_KEY;
+
+ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
+ if (ret > 0) {
+ ret = -ENOENT;
+ goto out;
+ }
+ if (ret < 0)
+ goto out;
+ di = btrfs_item_ptr(path.nodes[0], path.slots[0],
+ struct btrfs_dir_item);
+ btrfs_dir_item_key_to_cpu(path.nodes[0], di, &location);
+
+ /* Various basic check */
+ if (location.objectid != ino || location.type != BTRFS_INODE_ITEM_KEY ||
+ location.offset != 0)
+ goto out;
+ filetype = btrfs_dir_type(path.nodes[0], di);
+ if (filetype >= BTRFS_FT_MAX || filetype == BTRFS_FT_UNKNOWN)
+ goto out;
+ len = min_t(u32, BTRFS_NAME_LEN,
+ btrfs_item_size_nr(path.nodes[0], path.slots[0]) - sizeof(*di));
+ len = min_t(u32, len, btrfs_dir_name_len(path.nodes[0], di));
+ read_extent_buffer(path.nodes[0], namebuf, (unsigned long)(di + 1), len);
+ if (name_len != len || memcmp(namebuf, name, len))
+ goto out;
+ found = true;
+ *imode_ret = btrfs_type_to_imode(filetype);
+out:
+ btrfs_release_path(&path);
+ if (!found && !ret)
+ ret = -ENOENT;
+ return ret;
+}
+
+static int find_file_type_dir_item(struct btrfs_root *root, u64 ino, u64 dirid,
+ const char *name, u32 name_len,
+ u32 *imode_ret)
+{
+ struct btrfs_path path;
+ struct btrfs_key key;
+ struct btrfs_key location;
+ struct btrfs_dir_item *di;
+ char namebuf[BTRFS_NAME_LEN] = {0};
+ bool found = false;
+ unsigned long cur;
+ unsigned long end;
+ u8 filetype;
+ u32 len;
+ int ret;
+
+ btrfs_init_path(&path);
+ key.objectid = dirid;
+ key.offset = btrfs_name_hash(name, name_len);
+ key.type = BTRFS_DIR_INDEX_KEY;
+
+ ret = btrfs_search_slot(NULL, root, &key, &path, 0, 0);
+ if (ret > 0) {
+ ret = -ENOENT;
+ goto out;
+ }
+ if (ret < 0)
+ goto out;
+
+ cur = btrfs_item_ptr_offset(path.nodes[0], path.slots[0]);
+ end = cur + btrfs_item_size_nr(path.nodes[0], path.slots[0]);
+ while (cur < end) {
+ di = (struct btrfs_dir_item *)cur;
+ cur += btrfs_dir_name_len(path.nodes[0], di) + sizeof(*di);
+
+ btrfs_dir_item_key_to_cpu(path.nodes[0], di, &location);
+ /* Various basic check */
+ if (location.objectid != ino ||
+ location.type != BTRFS_INODE_ITEM_KEY ||
+ location.offset != 0)
+ continue;
+ filetype = btrfs_dir_type(path.nodes[0], di);
+ if (filetype >= BTRFS_FT_MAX || filetype == BTRFS_FT_UNKNOWN)
+ continue;
+ len = min_t(u32, BTRFS_NAME_LEN,
+ btrfs_item_size_nr(path.nodes[0], path.slots[0]) -
+ sizeof(*di));
+ len = min_t(u32, len, btrfs_dir_name_len(path.nodes[0], di));
+ read_extent_buffer(path.nodes[0], namebuf,
+ (unsigned long)(di + 1), len);
+ if (name_len != len || memcmp(namebuf, name, len))
+ continue;
+ *imode_ret = btrfs_type_to_imode(filetype);
+ found = true;
+ goto out;
+ }
+out:
+ btrfs_release_path(&path);
+ if (!found && !ret)
+ ret = -ENOENT;
+ return ret;
+}
+
+static int find_file_type(struct btrfs_root *root, u64 ino, u64 dirid,
+ u64 index, const char *name, u32 name_len,
+ u32 *imode_ret)
+{
+ int ret;
+ ret = find_file_type_dir_index(root, ino, dirid, index, name, name_len,
+ imode_ret);
+ if (ret == 0)
+ return ret;
+ return find_file_type_dir_item(root, ino, dirid, name, name_len,
+ imode_ret);
+}
+
/*
* Reset the inode mode of the inode specified by @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 ` Qu Wenruo [this message]
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 ` [PATCH v3 5/6] btrfs-progs: check/original: Fix inode mode in subvolume trees Qu Wenruo
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-3-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).