btrfs: Cleanup existing name_len checks

Since tree-checker has verified leaf when reading from disk, we don't
need the existing verify_dir_item() or btrfs_is_name_len_valid() checks.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Nikolay Borisov <nborisov@suse.com>
Reviewed-by: David Sterba <dsterba@suse.com>
Signed-off-by: David Sterba <dsterba@suse.com>

1 files changed, 9 insertions, 38 deletions

diff --git a/fs/btrfs/tree-log.c b/fs/btrfs/tree-log.c
index 7bf9b31561db..a806182dfea6 100644
--- a/fs/btrfs/tree-log.c
+++ b/fs/btrfs/tree-log.c
@@ -1173,19 +1173,15 @@ next:
         return 0;
 }
 
-static int extref_get_fields(struct extent_buffer *eb, int slot,
-                             unsigned long ref_ptr, u32 *namelen, char **name,
-                             u64 *index, u64 *parent_objectid)
+static int extref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
+                             u32 *namelen, char **name, u64 *index,
+                             u64 *parent_objectid)
 {
         struct btrfs_inode_extref *extref;
 
         extref = (struct btrfs_inode_extref *)ref_ptr;
 
         *namelen = btrfs_inode_extref_name_len(eb, extref);
-        if (!btrfs_is_name_len_valid(eb, slot, (unsigned long)&extref->name,
-                                     *namelen))
-                return -EIO;
-
         *name = kmalloc(*namelen, GFP_NOFS);
         if (*name == NULL)
                 return -ENOMEM;
@@ -1200,19 +1196,14 @@ static int extref_get_fields(struct extent_buffer *eb, int slot,
         return 0;
 }
 
-static int ref_get_fields(struct extent_buffer *eb, int slot,
-                          unsigned long ref_ptr, u32 *namelen, char **name,
-                          u64 *index)
+static int ref_get_fields(struct extent_buffer *eb, unsigned long ref_ptr,
+                          u32 *namelen, char **name, u64 *index)
 {
         struct btrfs_inode_ref *ref;
 
         ref = (struct btrfs_inode_ref *)ref_ptr;
 
         *namelen = btrfs_inode_ref_name_len(eb, ref);
-        if (!btrfs_is_name_len_valid(eb, slot, (unsigned long)(ref + 1),
-                                     *namelen))
-                return -EIO;
-
         *name = kmalloc(*namelen, GFP_NOFS);
         if (*name == NULL)
                 return -ENOMEM;
@@ -1287,8 +1278,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
 
         while (ref_ptr < ref_end) {
                 if (log_ref_ver) {
-                        ret = extref_get_fields(eb, slot, ref_ptr, &namelen,
-                                          &name, &ref_index, &parent_objectid);
+                        ret = extref_get_fields(eb, ref_ptr, &namelen, &name,
+                                                &ref_index, &parent_objectid);
                         /*
                          * parent object can change from one array
                          * item to another.
@@ -1300,8 +1291,8 @@ static noinline int add_inode_ref(struct btrfs_trans_handle *trans,
                                 goto out;
                         }
                 } else {
-                        ret = ref_get_fields(eb, slot, ref_ptr, &namelen,
-                                             &name, &ref_index);
+                        ret = ref_get_fields(eb, ref_ptr, &namelen, &name,
+                                             &ref_index);
                 }
                 if (ret)
                         goto out;
@@ -1835,7 +1826,6 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,
                                         struct extent_buffer *eb, int slot,
                                         struct btrfs_key *key)
 {
-        struct btrfs_fs_info *fs_info = root->fs_info;
         int ret = 0;
         u32 item_size = btrfs_item_size_nr(eb, slot);
         struct btrfs_dir_item *di;
@@ -1848,8 +1838,6 @@ static noinline int replay_one_dir_item(struct btrfs_trans_handle *trans,
         ptr_end = ptr + item_size;
         while (ptr < ptr_end) {
                 di = (struct btrfs_dir_item *)ptr;
-                if (verify_dir_item(fs_info, eb, slot, di))
-                        return -EIO;
                 name_len = btrfs_dir_name_len(eb, di);
                 ret = replay_one_name(trans, root, path, eb, di, key);
                 if (ret < 0)
@@ -2024,11 +2012,6 @@ again:
         ptr_end = ptr + item_size;
         while (ptr < ptr_end) {
                 di = (struct btrfs_dir_item *)ptr;
-                if (verify_dir_item(fs_info, eb, slot, di)) {
-                        ret = -EIO;
-                        goto out;
-                }
-
                 name_len = btrfs_dir_name_len(eb, di);
                 name = kmalloc(name_len, GFP_NOFS);
                 if (!name) {
@@ -2109,7 +2092,6 @@ static int replay_xattr_deletes(struct btrfs_trans_handle *trans,
                               struct btrfs_path *path,
                               const u64 ino)
 {
-        struct btrfs_fs_info *fs_info = root->fs_info;
         struct btrfs_key search_key;
         struct btrfs_path *log_path;
         int i;
@@ -2151,11 +2133,6 @@ process_leaf:
                         u32 this_len = sizeof(*di) + name_len + data_len;
                         char *name;
 
-                        ret = verify_dir_item(fs_info, path->nodes[0], i, di);
-                        if (ret) {
-                                ret = -EIO;
-                                goto out;
-                        }
                         name = kmalloc(name_len, GFP_NOFS);
                         if (!name) {
                                 ret = -ENOMEM;
@@ -4572,12 +4549,6 @@ static int btrfs_check_ref_name_override(struct extent_buffer *eb,
                         this_len = sizeof(*extref) + this_name_len;
                 }
 
-                ret = btrfs_is_name_len_valid(eb, slot, name_ptr,
-                                              this_name_len);
-                if (!ret) {
-                        ret = -EIO;
-                        goto out;
-                }
                 if (this_name_len > name_len) {
                         char *new_name;