From: Stephen Rothwell <sfr@canb•auug.org.au>
To: Miklos Szeredi <miklos@szeredi•hu>
Cc: David Sterba <dsterba@suse•cz>,
Linux-Next Mailing List <linux-next@vger•kernel.org>,
Linux Kernel Mailing List <linux-kernel@vger•kernel.org>,
Timofey Titovets <nefelim4ag@gmail•com>
Subject: Re: linux-next: manual merge of the overlayfs tree with the btrfs-kdave tree
Date: Mon, 18 Jun 2018 13:42:12 +1000 [thread overview]
Message-ID: <20180618134212.31202019@canb.auug.org.au> (raw)
In-Reply-To: <20180529095250.097524cf@canb.auug.org.au>
[-- Attachment #1: Type: text/plain, Size: 2020 bytes --]
Hi all,
On Tue, 29 May 2018 09:52:50 +1000 Stephen Rothwell <sfr@canb•auug.org.au> 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 #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 488 bytes --]
prev parent reply other threads:[~2018-06-18 3:42 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-05-28 23:52 linux-next: manual merge of the overlayfs tree with the btrfs-kdave tree Stephen Rothwell
2018-06-18 3:42 ` Stephen Rothwell [this message]
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20180618134212.31202019@canb.auug.org.au \
--to=sfr@canb$(echo .)auug.org.au \
--cc=dsterba@suse$(echo .)cz \
--cc=linux-kernel@vger$(echo .)kernel.org \
--cc=linux-next@vger$(echo .)kernel.org \
--cc=miklos@szeredi$(echo .)hu \
--cc=nefelim4ag@gmail$(echo .)com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox