Message ID | 20191119120732.24729-1-fdmanana@kernel.org (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
Series | Btrfs: fix cloning range with a hole when using the NO_HOLES feature | expand |
On Tue, Nov 19, 2019 at 12:07:32PM +0000, fdmanana@kernel.org wrote:
> From: Filipe Manana <fdmanana@suse.com>
[...]
Added to misc-next, thanks.
On Mon, Nov 25, 2019 at 1:46 PM David Sterba <dsterba@suse.cz> wrote: > > On Tue, Nov 19, 2019 at 12:07:32PM +0000, fdmanana@kernel.org wrote: > > From: Filipe Manana <fdmanana@suse.com> > [...] > > Added to misc-next, thanks. I have an updated version for this. Do you prefer me to send a new patch version, an incremental full patch or just the diff and then fold it? Thanks.
On Thu, Dec 05, 2019 at 11:22:57AM +0000, Filipe Manana wrote: > On Mon, Nov 25, 2019 at 1:46 PM David Sterba <dsterba@suse.cz> wrote: > > > > On Tue, Nov 19, 2019 at 12:07:32PM +0000, fdmanana@kernel.org wrote: > > > From: Filipe Manana <fdmanana@suse.com> > > [...] > > > > Added to misc-next, thanks. > > I have an updated version for this. Do you prefer me to send a new > patch version, an incremental full patch or just the diff and then > fold it? I think sending v2 of the patch is easier for you. Thanks.
diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c index c332968f9056..454aaf0b825c 100644 --- a/fs/btrfs/file.c +++ b/fs/btrfs/file.c @@ -2601,7 +2601,7 @@ int btrfs_punch_hole_range(struct inode *inode, struct btrfs_path *path, } } - if (clone_info) { + if (clone_info && cur_offset >= clone_info->file_offset) { u64 clone_len = drop_end - cur_offset; ret = btrfs_insert_clone_extent(trans, inode, path,