commit 33966de31fa698af8505fe99acc0298e565a60aa
author Qu Wenruo <wqu@suse.com> Wed Jun 24 18:02:56 2020 +0200
committer Tom Rini <trini@konsulko.com> Mon Sep 07 20:57:27 2020 -0400
tree 182416e16ac559e7e7df2f93ea09654f604042bc
parent 75b0817babe733ecf8d503c3ecce371e9991ca76

fs: btrfs: Rename struct btrfs_path to struct __btrfs_path

To avoid name conflicting between the extent buffer based btrfs_path
from btrfs-progs, rename struct btrfs_path to struct __btrfs_path.

Also rename btrfs_free_path() to __btrfs_free_path() to avoid conflicts.

Signed-off-by: Qu Wenruo <wqu@suse.com>
Reviewed-by: Marek Behún <marek.behun@nic.cz>

fs/btrfs/extent-io.c

diff --git a/fs/btrfs/extent-io.c b/fs/btrfs/extent-io.c
index eec89d1..a524145 100644
--- a/fs/btrfs/extent-io.c
+++ b/fs/btrfs/extent-io.c
@@ -14,7 +14,7 @@
 #include "extent-io.h"
 #include "disk-io.h"
 
-u64 btrfs_read_extent_inline(struct btrfs_path *path,
+u64 btrfs_read_extent_inline(struct __btrfs_path *path,
 			     struct btrfs_file_extent_item *extent, u64 offset,
 			     u64 size, char *out)
 {
@@ -66,7 +66,7 @@
 	return -1ULL;
 }
 
-u64 btrfs_read_extent_reg(struct btrfs_path *path,
+u64 btrfs_read_extent_reg(struct __btrfs_path *path,
 			  struct btrfs_file_extent_item *extent, u64 offset,
 			  u64 size, char *out)
 {