Hi all,
On Tue, 29 May 2018 09:52:50 +1000 Stephen Rothwell <sfr@xxxxxxxxxxxxxxxx> wrote:
>
> Today's linux-next merge of the overlayfs tree got a conflict in:
>
> fs/btrfs/ioctl.c
>
> between commit:
>
> 0b4dc087e29a ("Btrfs: dedupe_file_range ioctl: remove 16MiB restriction")
>
> from the btrfs-kdave tree and commits:
>
> 83d499febfac ("vfs: dedpue: return loff_t")
> 7765f19ed5f9 ("vfs: dedupe: rationalize args")
>
> from the overlayfs tree.
>
> [I note the typo in the subject of commit 83d499febfac]
>
> I fixed it up (see below) and can carry the fix as necessary. This
> is now fixed as far as linux-next is concerned, but any non trivial
> conflicts should be mentioned to your upstream maintainer when your tree
> is submitted for merging. You may also want to consider cooperating
> with the maintainer of the conflicting tree to minimise any particularly
> complex conflicts.
>
> --
> Cheers,
> Stephen Rothwell
>
> diff --cc fs/btrfs/ioctl.c
> index 4d88d54d042d,70eac76804df..000000000000
> --- a/fs/btrfs/ioctl.c
> +++ b/fs/btrfs/ioctl.c
> @@@ -3637,14 -3192,20 +3637,15 @@@ out_free
> return ret;
> }
>
> - ssize_t btrfs_dedupe_file_range(struct file *src_file, u64 loff, u64 olen,
> - struct file *dst_file, u64 dst_loff)
> -#define BTRFS_MAX_DEDUPE_LEN SZ_16M
> -
> + loff_t btrfs_dedupe_file_range(struct file *src_file, loff_t loff,
> + struct file *dst_file, loff_t dst_loff,
> + loff_t olen)
> {
> struct inode *src = file_inode(src_file);
> struct inode *dst = file_inode(dst_file);
> u64 bs = BTRFS_I(src)->root->fs_info->sb->s_blocksize;
> - ssize_t res;
> + int res;
>
> - if (olen > BTRFS_MAX_DEDUPE_LEN)
> - olen = BTRFS_MAX_DEDUPE_LEN;
> -
> if (WARN_ON_ONCE(bs < PAGE_SIZE)) {
> /*
> * Btrfs does not support blocksize < page_size. As a
This is now a conflict between the overlayfs tree and Linus' tree.
--
Cheers,
Stephen Rothwell
Attachment:
pgpr1GfnEOWVF.pgp
Description: OpenPGP digital signature
