Merge git://git.jan-o-sch.net/btrfs-unstable into for-linus

Conflicts:
	fs/btrfs/transaction.c

Signed-off-by: Chris Mason <chris.mason@oracle.com>

1 files changed, 2 insertions, 2 deletions

diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c
index 205809200714..a979ab7d3967 100644
--- a/fs/btrfs/ioctl.c
+++ b/fs/btrfs/ioctl.c
@@ -3121,8 +3121,8 @@ static long btrfs_ioctl_logical_to_ino(struct btrfs_root *root,
                 goto out;
 
         extent_item_pos = loi->logical - key.objectid;
-        ret = iterate_extent_inodes(root->fs_info, path, key.objectid,
-                                        extent_item_pos, build_ino_list,
+        ret = iterate_extent_inodes(root->fs_info, key.objectid,
+                                        extent_item_pos, 0, build_ino_list,
                                         inodes);
 
         if (ret < 0)