From: Omar Sandoval <osandov@osandov.com> To: David Sterba <dsterba@suse.cz> Cc: linux-btrfs@vger.kernel.org, kernel-team@fb.com, David Sterba <dsterba@suse.com>, Timofey Titovets <nefelim4ag@gmail.com> Subject: Re: [PATCH 0/2] Btrfs: fix partly checksummed file races Date: Wed, 23 May 2018 10:14:14 -0700 [thread overview] Message-ID: <20180523171414.GA12533@vader> (raw) In-Reply-To: <20180523101714.GZ6649@twin.jikos.cz> On Wed, May 23, 2018 at 12:17:14PM +0200, David Sterba wrote: > On Tue, May 22, 2018 at 03:02:11PM -0700, Omar Sandoval wrote: > > Based on kdave/for-next. Note that there's a Fixes: tag in there > > referencing a commit in the for-next branch, so that would have to be > > updated if the commit gets rebased. These patches are also available at > > https://github.com/osandov/linux/tree/btrfs-nodatasum-race. > > If the original patch is not in any released or frozen branch, then the > fix should be folded to the original patch. The for-next branch is for > preview, testing and catching bugs that slip past the review. And gets > reassembled frequently so referencing a patch from there does not make > sense. > > Sending the fixups as patches is ok, replies to the original thread > might get lost in the noise. Ok, let's fold it in. I pushed Timofey's series with the fix folded in here: https://github.com/osandov/linux/tree/btrfs-ioctl-fixes, based on misc-next with Timofey's patches removed. The diff vs his original patches is the same as my patch: diff --git a/fs/btrfs/ioctl.c b/fs/btrfs/ioctl.c index 65d709002775..75c66ac77fd7 100644 --- a/fs/btrfs/ioctl.c +++ b/fs/btrfs/ioctl.c @@ -3113,12 +3113,6 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen, if (olen == 0) return 0; - /* don't make the dst file partly checksummed */ - if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) != - (BTRFS_I(dst)->flags & BTRFS_INODE_NODATASUM)) { - return -EINVAL; - } - tail_len = olen % BTRFS_MAX_DEDUPE_LEN; chunk_count = div_u64(olen, BTRFS_MAX_DEDUPE_LEN); if (chunk_count == 0) @@ -3151,6 +3145,13 @@ static int btrfs_extent_same(struct inode *src, u64 loff, u64 olen, else btrfs_double_inode_lock(src, dst); + /* don't make the dst file partly checksummed */ + if ((BTRFS_I(src)->flags & BTRFS_INODE_NODATASUM) != + (BTRFS_I(dst)->flags & BTRFS_INODE_NODATASUM)) { + ret = -EINVAL; + goto out; + } + for (i = 0; i < chunk_count; i++) { ret = btrfs_extent_same_range(src, loff, BTRFS_MAX_DEDUPE_LEN, dst, dst_loff, &cmp); The clone fix and device remove fix are in that branch, too. Let me know if you'd prefer it as patches.
next prev parent reply other threads:[~2018-05-23 17:14 UTC|newest] Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-05-22 22:02 Omar Sandoval 2018-05-22 22:02 ` [PATCH 1/2] Btrfs: fix clone vs chattr NODATASUM race Omar Sandoval 2018-05-23 6:07 ` Nikolay Borisov 2018-05-23 18:22 ` David Sterba 2018-05-22 22:02 ` [PATCH 2/2] Btrfs: fix dedupe " Omar Sandoval 2018-05-23 6:10 ` Nikolay Borisov 2018-05-23 10:17 ` [PATCH 0/2] Btrfs: fix partly checksummed file races David Sterba 2018-05-23 17:14 ` Omar Sandoval [this message] 2018-05-23 18:03 ` David Sterba
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=20180523171414.GA12533@vader \ --to=osandov@osandov.com \ --cc=dsterba@suse.com \ --cc=dsterba@suse.cz \ --cc=kernel-team@fb.com \ --cc=linux-btrfs@vger.kernel.org \ --cc=nefelim4ag@gmail.com \ --subject='Re: [PATCH 0/2] Btrfs: fix partly checksummed file races' \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: link
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.