Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6f45d185 authored by Nikolay Borisov's avatar Nikolay Borisov Committed by David Sterba
Browse files

btrfs: Make btrfs_insert_delayed_dir_index take btrfs_inode 



Signed-off-by: default avatarNikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: default avatarDavid Sterba <dsterba@suse.com>
parent fcabdd1c

fs/btrfs/delayed-inode.c

+3 −3
Original line number Diff line number Diff line
@@ -1432,7 +1432,7 @@ void btrfs_balance_delayed_items(struct btrfs_fs_info *fs_info) 
int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,

				   struct btrfs_fs_info *fs_info,

				   const char *name, int name_len,

				   struct inode *dir,

				   struct btrfs_inode *dir,

				   struct btrfs_disk_key *disk_key, u8 type,

				   u64 index)

{
@@ -1441,7 +1441,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
	struct btrfs_dir_item *dir_item;

	int ret;



	delayed_node = btrfs_get_or_create_delayed_node(BTRFS_I(dir));

	delayed_node = btrfs_get_or_create_delayed_node(dir);

	if (IS_ERR(delayed_node))

		return PTR_ERR(delayed_node);
@@ -1451,7 +1451,7 @@ int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans, 
		goto release_node;

	}



	delayed_item->key.objectid = btrfs_ino(BTRFS_I(dir));

	delayed_item->key.objectid = btrfs_ino(dir);

	delayed_item->key.type = BTRFS_DIR_INDEX_KEY;

	delayed_item->key.offset = index;

fs/btrfs/delayed-inode.h

+1 −1
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static inline void btrfs_init_delayed_root( 
int btrfs_insert_delayed_dir_index(struct btrfs_trans_handle *trans,

				   struct btrfs_fs_info *fs_info,

				   const char *name, int name_len,

				   struct inode *dir,

				   struct btrfs_inode *dir,

				   struct btrfs_disk_key *disk_key, u8 type,

				   u64 index);

fs/btrfs/dir-item.c

+1 −1
Original line number Diff line number Diff line
@@ -174,7 +174,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root 
	btrfs_release_path(path);



	ret2 = btrfs_insert_delayed_dir_index(trans, root->fs_info, name,

					      name_len, dir, &disk_key, type,

					      name_len, BTRFS_I(dir), &disk_key, type,

					      index);

out_free:

	btrfs_free_path(path);