diff options
author | Lu Fengqi <lufq.fnst@cn.fujitsu.com> | 2018-07-31 23:32:26 -0400 |
---|---|---|
committer | David Sterba <dsterba@suse.com> | 2018-08-06 07:13:00 -0400 |
commit | 9add29457ac124e846cde4b875c632edaa722c08 (patch) | |
tree | b9ea9fda8ac6110c87be1806d32b6e3f1a8a89bc /fs/btrfs/delayed-inode.c | |
parent | 4465c8b4229de50f17b6780677ce068b3582a55d (diff) |
btrfs: Remove fs_info from btrfs_delete_delayed_dir_index
It can be referenced from the passed transaction handle.
Signed-off-by: Lu Fengqi <lufq.fnst@cn.fujitsu.com>
Signed-off-by: David Sterba <dsterba@suse.com>
Diffstat (limited to 'fs/btrfs/delayed-inode.c')
-rw-r--r-- | fs/btrfs/delayed-inode.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/fs/btrfs/delayed-inode.c b/fs/btrfs/delayed-inode.c index 5d103eda1874..f51b509f2d9b 100644 --- a/fs/btrfs/delayed-inode.c +++ b/fs/btrfs/delayed-inode.c | |||
@@ -1493,7 +1493,6 @@ static int btrfs_delete_delayed_insertion_item(struct btrfs_fs_info *fs_info, | |||
1493 | } | 1493 | } |
1494 | 1494 | ||
1495 | int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, | 1495 | int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, |
1496 | struct btrfs_fs_info *fs_info, | ||
1497 | struct btrfs_inode *dir, u64 index) | 1496 | struct btrfs_inode *dir, u64 index) |
1498 | { | 1497 | { |
1499 | struct btrfs_delayed_node *node; | 1498 | struct btrfs_delayed_node *node; |
@@ -1509,7 +1508,8 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, | |||
1509 | item_key.type = BTRFS_DIR_INDEX_KEY; | 1508 | item_key.type = BTRFS_DIR_INDEX_KEY; |
1510 | item_key.offset = index; | 1509 | item_key.offset = index; |
1511 | 1510 | ||
1512 | ret = btrfs_delete_delayed_insertion_item(fs_info, node, &item_key); | 1511 | ret = btrfs_delete_delayed_insertion_item(trans->fs_info, node, |
1512 | &item_key); | ||
1513 | if (!ret) | 1513 | if (!ret) |
1514 | goto end; | 1514 | goto end; |
1515 | 1515 | ||
@@ -1531,7 +1531,7 @@ int btrfs_delete_delayed_dir_index(struct btrfs_trans_handle *trans, | |||
1531 | mutex_lock(&node->mutex); | 1531 | mutex_lock(&node->mutex); |
1532 | ret = __btrfs_add_delayed_deletion_item(node, item); | 1532 | ret = __btrfs_add_delayed_deletion_item(node, item); |
1533 | if (unlikely(ret)) { | 1533 | if (unlikely(ret)) { |
1534 | btrfs_err(fs_info, | 1534 | btrfs_err(trans->fs_info, |
1535 | "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)", | 1535 | "err add delayed dir index item(index: %llu) into the deletion tree of the delayed node(root id: %llu, inode id: %llu, errno: %d)", |
1536 | index, node->root->objectid, node->inode_id, ret); | 1536 | index, node->root->objectid, node->inode_id, ret); |
1537 | BUG(); | 1537 | BUG(); |