diff options
| author | Nikolay Borisov <n.borisov.lkml@gmail.com> | 2017-01-10 20:35:35 +0200 |
|---|---|---|
| committer | David Sterba <dsterba@suse.com> | 2017-02-14 15:50:52 +0100 |
| commit | 6f45d18568c2020085fe3f2e87ea883ad00e3861 (patch) | |
| tree | 1d33879de4690a8fe28257f9e9381a99ac71a20c | |
| parent | fcabdd1ca51f9fd6ced977b2279da19d123b7512 (diff) | |
| download | op-kernel-dev-6f45d18568c2020085fe3f2e87ea883ad00e3861.zip op-kernel-dev-6f45d18568c2020085fe3f2e87ea883ad00e3861.tar.gz | |
btrfs: Make btrfs_insert_delayed_dir_index take btrfs_inode
Signed-off-by: Nikolay Borisov <n.borisov.lkml@gmail.com>
Signed-off-by: David Sterba <dsterba@suse.com>
| -rw-r--r-- | fs/btrfs/delayed-inode.c | 6 | ||||
| -rw-r--r-- | fs/btrfs/delayed-inode.h | 2 | ||||
| -rw-r--r-- | fs/btrfs/dir-item.c | 2 |
3 files changed, 5 insertions, 5 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index aa7032d..a944b6c 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c @@ -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; diff --git a/fs/btrfs/delayed-inode.h b/fs/btrfs/delayed-inode.h index 8a2bf5e..3cbd9bb 100644 --- a/fs/btrfs/delayed-inode.h +++ b/fs/btrfs/delayed-inode.h @@ -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); diff --git a/fs/btrfs/dir-item.c b/fs/btrfs/dir-item.c index 74de492..2c2b707 100644 --- a/fs/btrfs/dir-item.c +++ b/fs/btrfs/dir-item.c @@ -174,7 +174,7 @@ second_insert: 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); |
