btrfs: dir-item: Introduce btrfs_lookup_match_dir
PATCH 1/1 btrfs: dir-item: Introduce btrfs_lookup_match_dir
btrfs_search_slot is called in multiple places in dir-item.c to search to a dir entry, and then calling btrfs_match_dir_name to return a btrfs_dir_item struct.
In order to reduce the number of callers of btrfs_search_slot, create a common function that check's if the dir key, and if found call btrfs_match_dir_item_name.
No functional changes.
--- fs/btrfs/dir-item.c | 77 +++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 37 deletions(-)
fs/btrfs/dir-item.c +40 -37
@@ -170,6 +170,25 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name,return 0 ; } +static struct btrfs_dir_item * +btrfs_lookup_match_dir (struct btrfs_trans_handle *trans, +struct btrfs_root *root,struct btrfs_path *path, +struct btrfs_key *key,const char *name, +int name_len,int mod) +{ +int ret; +int ins_len = mod <0 ?-1 :0 ; +int cow = mod !=0 ; + + ret =btrfs_search_slot (trans, root, key, path, ins_len, cow); +if (ret <0 ) +return ERR_PTR (ret); +if (ret >0 ) +return ERR_PTR (-ENOENT ); + +return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +} +/* * lookup a directory item based on name. 'dir' is the objectid * we're searching in, and 'mod' tells us if you plan on deleting the
@@ -181,23 +200,18 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, const char *name, int name_len, int mod) { - int ret; struct btrfs_key key; -int ins_len = mod <0 ?-1 :0 ; -int cow = mod !=0 ; +struct btrfs_dir_item *di; key.objectid = dir; key.type =BTRFS_DIR_ITEM_KEY ; - key.offset =btrfs_name_hash (name, name_len); - ret =btrfs_search_slot (trans, root, &key, path, ins_len, cow); -if (ret <0 ) -return ERR_PTR (ret); -if (ret >0 ) + di =btrfs_lookup_match_dir (trans, root, path, &key, name, name_len, mod); +if (IS_ERR (di) &&PTR_ERR (di) == -ENOENT )return NULL ; -return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +return di; } int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,
@@ -211,7 +225,6 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,int slot;struct btrfs_path *path; - path =btrfs_alloc_path ();if (!path)return -ENOMEM ;
@@ -220,20 +233,21 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, key.type =BTRFS_DIR_ITEM_KEY ; key.offset =btrfs_name_hash (name, name_len); - ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); - -/* return back any errors */ -if (ret <0 ) - goto out; + di =btrfs_lookup_match_dir (NULL , root, path, &key, name, name_len,0 ); +if (IS_ERR (di)) { + ret =PTR_ERR (di); +/* nothing found, we're safe */ +if (ret == -ENOENT ) { + ret =0 ; + goto out; + } -/* nothing found, we're safe */ -if (ret >0 ) { - ret =0 ; - goto out; +/* return back any errors */ +if (ret <0 ) + goto out; }/* we found an item, look for our name in the item */ - di =btrfs_match_dir_item_name (root->fs_info, path, name, name_len);if (di) {/* our exact name was found */ ret = -EEXIST ;
@@ -274,21 +288,13 @@ btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, u64 objectid, const char *name, int name_len, int mod) { - int ret; struct btrfs_key key; -int ins_len = mod <0 ?-1 :0 ; -int cow = mod !=0 ; key.objectid = dir; key.type =BTRFS_DIR_INDEX_KEY ; key.offset = objectid; - ret =btrfs_search_slot (trans, root, &key, path, ins_len, cow); -if (ret <0 ) -return ERR_PTR (ret); -if (ret >0 ) -return ERR_PTR (-ENOENT ); -return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +return btrfs_lookup_match_dir (trans, root, path, &key, name, name_len, mod); } struct btrfs_dir_item *
@@ -345,21 +351,18 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, const char *name, u16 name_len, int mod) { - int ret; struct btrfs_key key; -int ins_len = mod <0 ?-1 :0 ; -int cow = mod !=0 ; +struct btrfs_dir_item *di; key.objectid = dir; key.type =BTRFS_XATTR_ITEM_KEY ; key.offset =btrfs_name_hash (name, name_len); - ret =btrfs_search_slot (trans, root, &key, path, ins_len, cow); -if (ret <0 ) -return ERR_PTR (ret); -if (ret >0 ) + + di =btrfs_lookup_match_dir (trans, root, path, &key, name, name_len, mod); +if (IS_ERR (di) &&PTR_ERR (di) == -ENOENT )return NULL ; -return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +return di; }/*
Signature · 1 line
2.26.2
Quoted 11 lines · Marcos Paulo de Souza
btrfs_search_slotis called in multiple places indir-item.cto search to a dir entry, and then callingbtrfs_match_dir_nameto return abtrfs_dir_itemstruct.In order to reduce the number of callers of
btrfs_search_slot, create a common function that check's if the dir key, and if found callbtrfs_match_dir_item_name.No functional changes.
Signed-off-by Marcos Paulo de Souza <[email protected]>
Added to misc-next, thanks.
Quoted 9 lines
--- fs/btrfs/dir-item.c | 77 +++++++++++++++++++++++---------------------- 1 file changed, 40 insertions(+), 37 deletions(-)fs/btrfs/dir-item.c +0
-0
fs/btrfs/dir-item.c int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name, · line 177
Quoted 8 lines
fs/btrfs/dir-item.c +5
-0@@ -170,6 +170,25 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name,return 0 ; } +static struct btrfs_dir_item * +btrfs_lookup_match_dir (struct btrfs_trans_handle *trans, +struct btrfs_root *root,struct btrfs_path *path, +struct btrfs_key *key,const char *name, +int name_len,int mod)
Please keep the type and name on the same line, overflowing arguments go to the next line.
fs/btrfs/dir-item.c int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, const char *name, · line 181
Quoted 4 lines
fs/btrfs/dir-item.c +4
-0+{ +int ret; +int ins_len = mod <0 ?-1 :0 ; +int cow = mod !=0 ;
Both can be const.
Quoted 133 lines
fs/btrfs/dir-item.c +31
-37+ + ret =btrfs_search_slot (trans, root, key, path, ins_len, cow); +if (ret <0 ) +return ERR_PTR (ret); +if (ret >0 ) +return ERR_PTR (-ENOENT ); + +return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +} +/* * lookup a directory item based on name. 'dir' is the objectid * we're searching in, and 'mod' tells us if you plan on deleting the @@ -181,23 +200,18 @@ struct btrfs_dir_item *btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, const char *name, int name_len, int mod) { - int ret; struct btrfs_key key; -int ins_len = mod <0 ?-1 :0 ; -int cow = mod !=0 ; +struct btrfs_dir_item *di; key.objectid = dir; key.type =BTRFS_DIR_ITEM_KEY ; - key.offset =btrfs_name_hash (name, name_len); - ret =btrfs_search_slot (trans, root, &key, path, ins_len, cow); -if (ret <0 ) -return ERR_PTR (ret); -if (ret >0 ) + di =btrfs_lookup_match_dir (trans, root, path, &key, name, name_len, mod); +if (IS_ERR (di) &&PTR_ERR (di) == -ENOENT )return NULL ; -return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +return di; } int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,@@ -211,7 +225,6 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir,int slot;struct btrfs_path *path; - path =btrfs_alloc_path ();if (!path)return -ENOMEM ;@@ -220,20 +233,21 @@ int btrfs_check_dir_item_collision(struct btrfs_root *root, u64 dir, key.type =BTRFS_DIR_ITEM_KEY ; key.offset =btrfs_name_hash (name, name_len); - ret =btrfs_search_slot (NULL , root, &key, path,0 ,0 ); - -/* return back any errors */ -if (ret <0 ) - goto out; + di =btrfs_lookup_match_dir (NULL , root, path, &key, name, name_len,0 ); +if (IS_ERR (di)) { + ret =PTR_ERR (di); +/* nothing found, we're safe */ +if (ret == -ENOENT ) { + ret =0 ; + goto out; + } -/* nothing found, we're safe */ -if (ret >0 ) { - ret =0 ; - goto out; +/* return back any errors */ +if (ret <0 ) + goto out; }/* we found an item, look for our name in the item */ - di =btrfs_match_dir_item_name (root->fs_info, path, name, name_len);if (di) {/* our exact name was found */ ret = -EEXIST ;@@ -274,21 +288,13 @@ btrfs_lookup_dir_index_item(struct btrfs_trans_handle *trans, u64 objectid, const char *name, int name_len, int mod) { - int ret; struct btrfs_key key; -int ins_len = mod <0 ?-1 :0 ; -int cow = mod !=0 ; key.objectid = dir; key.type =BTRFS_DIR_INDEX_KEY ; key.offset = objectid; - ret =btrfs_search_slot (trans, root, &key, path, ins_len, cow); -if (ret <0 ) -return ERR_PTR (ret); -if (ret >0 ) -return ERR_PTR (-ENOENT ); -return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +return btrfs_lookup_match_dir (trans, root, path, &key, name, name_len, mod); } struct btrfs_dir_item *@@ -345,21 +351,18 @@ struct btrfs_dir_item *btrfs_lookup_xattr(struct btrfs_trans_handle *trans, const char *name, u16 name_len, int mod) { - int ret; struct btrfs_key key; -int ins_len = mod <0 ?-1 :0 ; -int cow = mod !=0 ; +struct btrfs_dir_item *di; key.objectid = dir; key.type =BTRFS_XATTR_ITEM_KEY ; key.offset =btrfs_name_hash (name, name_len); - ret =btrfs_search_slot (trans, root, &key, path, ins_len, cow); -if (ret <0 ) -return ERR_PTR (ret); -if (ret >0 ) + + di =btrfs_lookup_match_dir (trans, root, path, &key, name, name_len, mod); +if (IS_ERR (di) &&PTR_ERR (di) == -ENOENT )return NULL ; -return btrfs_match_dir_item_name (root->fs_info, path, name, name_len); +return di; }/* Signature · 1 line
2.26.2