On Thu, Feb 20, 2020 at 09:23:44AM +1100, Stephen Rothwell wrote:
> Hi all,
>
> After merging the btrfs tree, today's linux-next build (powerpc
> ppc64_defconfig) failed like this:
>
> fs/btrfs/extent-tree.c: In function 'btrfs_alloc_logged_file_extent':
> fs/btrfs/extent-tree.c:4425:20: error: passing argument 1 of 'btrfs_pin_extent' from incompatible pointer type [-Werror=incompatible-pointer-types]
> 4425 | btrfs_pin_extent(fs_info, ins->objectid, ins->offset, 1);
> | ^~~~~~~
> | |
> | struct btrfs_fs_info *
> fs/btrfs/extent-tree.c:2609:49: note: expected 'struct btrfs_trans_handle *' but argument is of type 'struct btrfs_fs_info *'
> 2609 | int btrfs_pin_extent(struct btrfs_trans_handle *trans,
> | ~~~~~~~~~~~~~~~~~~~~~~~~~~~^~~~~
>
> Caused by commit
>
> 4e2c2f96e6a3 ("btrfs: Make btrfs_pin_extent take trans handle")
>
> interacting with commit
>
> bd727173e443 ("btrfs: handle logged extent failure properly")
>
> from the btrfs-fixes tree.
>
> I have applied the following merge fix patch for today.
Sorry, I'll fix the branch in the next for-next snapshot.
