On Tue, May 30, 2017 at 9:50 PM, Omar Sandoval <osan...@osandov.com> wrote: > On Sun, May 28, 2017 at 05:31:53PM +0100, fdman...@kernel.org wrote: >> From: Filipe Manana <fdman...@suse.com> > > [snip] > > Hey, Filipe, > > I saw this warning and tried to apply your patch, but it doesn't apply > cleanly (seems to conflict with 9986277e0e4c ("Btrfs: handle only > applicable errors returned by btrfs_get_extent")).
Yes, it was based on an older branch. I'll rebase it. Thanks. > >> Fixes: d77815461f04 ("btrfs: Avoid trucating page or punching hole in a >> already existed hole.") >> Cc: <sta...@vger.kernel.org> >> Signed-off-by: Filipe Manana <fdman...@suse.com> >> --- >> fs/btrfs/file.c | 4 +++- >> 1 file changed, 3 insertions(+), 1 deletion(-) >> >> diff --git a/fs/btrfs/file.c b/fs/btrfs/file.c >> index f7d022bc7998..2645d820422c 100644 >> --- a/fs/btrfs/file.c >> +++ b/fs/btrfs/file.c >> @@ -2390,10 +2390,12 @@ static int fill_holes(struct btrfs_trans_handle >> *trans, >> */ >> static int find_first_non_hole(struct inode *inode, u64 *start, u64 *len) >> { >> + struct btrfs_fs_info *fs_info = btrfs_sb(inode->i_sb); >> struct extent_map *em; >> int ret = 0; >> >> - em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, *start, *len, 0); >> + em = btrfs_get_extent(BTRFS_I(inode), NULL, 0, *start, >> + round_up(*len, fs_info->sectorsize), 0); >> if (IS_ERR_OR_NULL(em)) { >> if (!em) >> ret = -ENOMEM; >> -- >> 2.11.0 >> >> -- >> To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in >> the body of a message to majord...@vger.kernel.org >> More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majord...@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html