> -conflict_again:
> +
> + if (search_done)
> + goto insert;
> +
> ret = btrfs_search_slot(NULL, root, key, path, 0, 0);
> if (ret == 0) {
> char *victim_name;
> @@ -887,36 +890,22 @@ conflict_again:
> inode, victim_name,
> victim_name_len);
> kfree(victim_name);
> - btrfs_release_path(root, path);
> - goto conflict_again;
> }
> - kfree(victim_name);
> + if (victim_name)
> + kfree(victim_name);
This is still wrong..
Just remove the first kfree() and remain the second one.
> ptr = (unsigned long)(victim_ref + 1) + victim_name_len;
> }
> BUG_ON(ret);
> - }
> - btrfs_release_path(root, path);
>
> - /* look for a conflicting sequence number */
> - di = btrfs_lookup_dir_index_item(trans, root, path, dir->i_ino,
> - btrfs_inode_ref_index(eb, ref),
> - name, namelen, 0);
> - if (di && !IS_ERR(di)) {
> - ret = drop_one_dir_item(trans, root, path, dir, di);
> - BUG_ON(ret);
> - }
> - btrfs_release_path(root, path);
> -
> -
> - /* look for a conflicting name */
> - di = btrfs_lookup_dir_item(trans, root, path, dir->i_ino,
> - name, namelen, 0);
> - if (di && !IS_ERR(di)) {
> - ret = drop_one_dir_item(trans, root, path, dir, di);
> - BUG_ON(ret);
> + /*
> + * NOTE: we have searched root tree and checked the
> + * coresponding ref, it does not need to check again.
> + */
> + search_done = 1;
> }
> btrfs_release_path(root, path);
>
> +insert:
> /* insert our name */
> ret = btrfs_add_link(trans, dir, inode, name, namelen, 0,
> btrfs_inode_ref_index(eb, ref));
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
