From d78d642bffff6ea49d62c19f26052ed6d3dcc467 Mon Sep 17 00:00:00 2001 From: Dimitri John Ledkov Date: Thu, 11 Jan 2018 15:44:55 +0000 Subject: New upstream release. --- dir-item.c | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) (limited to 'dir-item.c') diff --git a/dir-item.c b/dir-item.c index e34f6935..462546c0 100644 --- a/dir-item.c +++ b/dir-item.c @@ -135,7 +135,14 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root name, name_len); if (IS_ERR(dir_item)) { ret = PTR_ERR(dir_item); - goto out; + + /* Continue to insert item if existed */ + if (ret == -EEXIST) { + ret = 0; + goto insert; + } else { + goto out; + } } leaf = path->nodes[0]; @@ -149,6 +156,7 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root write_extent_buffer(leaf, name, name_ptr, name_len); btrfs_mark_buffer_dirty(leaf); +insert: /* FIXME, use some real flag for selecting the extra index */ if (root == root->fs_info->tree_root) { ret = 0; @@ -162,6 +170,8 @@ int btrfs_insert_dir_item(struct btrfs_trans_handle *trans, struct btrfs_root name, name_len); if (IS_ERR(dir_item)) { ret2 = PTR_ERR(dir_item); + if (ret2 == -EEXIST) + ret = 0; goto out; } leaf = path->nodes[0]; -- cgit v1.2.3