diff options
| author | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:33:40 -0400 |
|---|---|---|
| committer | Chris Mason <chris.mason@oracle.com> | 2012-03-28 20:33:40 -0400 |
| commit | 98961a7e431735c791dbaaf0337029e219a5db5a (patch) | |
| tree | e045f062c01075e1f88ab758717cbfd7a7ddd4ca /fs/btrfs/ioctl.c | |
| parent | 1c691b330a19a1344df89bcb0f4cacd99e8b289a (diff) | |
| parent | 7a3ae2f8c8c8432e65467b7fc84d5deab04061a0 (diff) | |
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>
Diffstat (limited to 'fs/btrfs/ioctl.c')
| -rw-r--r-- | fs/btrfs/ioctl.c | 4 |
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) |