Mountable btrfs, with readdir
Signed-off-by: Chris Mason <chris.mason@oracle.com>
This commit is contained in:

committed by
David Woodhouse

parent
2e635a2783
commit
e20d96d64f
@@ -18,12 +18,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
|
||||
key.objectid = dir;
|
||||
key.flags = 0;
|
||||
btrfs_set_key_type(&key, BTRFS_DIR_ITEM_KEY);
|
||||
if (name_len == 1 && *name == '.')
|
||||
key.offset = 1;
|
||||
else if (name_len == 2 && name[0] == '.' && name[1] == '.')
|
||||
key.offset = 2;
|
||||
else
|
||||
ret = btrfs_name_hash(name, name_len, &key.offset);
|
||||
ret = btrfs_name_hash(name, name_len, &key.offset);
|
||||
BUG_ON(ret);
|
||||
btrfs_init_path(&path);
|
||||
data_size = sizeof(*dir_item) + name_len;
|
||||
@@ -31,7 +26,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
|
||||
if (ret)
|
||||
goto out;
|
||||
|
||||
dir_item = btrfs_item_ptr(&path.nodes[0]->leaf, path.slots[0],
|
||||
dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path.nodes[0]),
|
||||
path.slots[0],
|
||||
struct btrfs_dir_item);
|
||||
btrfs_set_dir_objectid(dir_item, objectid);
|
||||
btrfs_set_dir_type(dir_item, type);
|
||||
@@ -45,8 +41,8 @@ out:
|
||||
}
|
||||
|
||||
int btrfs_lookup_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root
|
||||
*root, struct btrfs_path *path, u64 dir, char *name,
|
||||
int name_len, int mod)
|
||||
*root, struct btrfs_path *path, u64 dir,
|
||||
const char *name, int name_len, int mod)
|
||||
{
|
||||
int ret;
|
||||
struct btrfs_key key;
|
||||
@@ -69,7 +65,8 @@ int btrfs_match_dir_item_name(struct btrfs_root *root,
|
||||
struct btrfs_dir_item *dir_item;
|
||||
char *name_ptr;
|
||||
|
||||
dir_item = btrfs_item_ptr(&path->nodes[0]->leaf, path->slots[0],
|
||||
dir_item = btrfs_item_ptr(btrfs_buffer_leaf(path->nodes[0]),
|
||||
path->slots[0],
|
||||
struct btrfs_dir_item);
|
||||
if (btrfs_dir_name_len(dir_item) != name_len)
|
||||
return 0;
|
||||
|
Reference in New Issue
Block a user