Message ID | CAL3q7H4F4ohPo=LK_dhT+wom7KmP7PwSqm8GzkvknPpBqbR85Q@mail.gmail.com (mailing list archive) |
---|---|
State | New, archived |
Headers | show |
On 11/27/2015 12:07 PM, Filipe Manana wrote: > Try the following (also pasted at > https://friendpaste.com/5O6o1cqWqJZDIKrH1YqG7y): Doesn't apply neither against the used 4.2.6 kernel nor aginst current git HEAD : t44 linux # patch -p1 --dry-run < /home/tfoerste/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch checking file fs/btrfs/extent_map.c Hunk #1 FAILED at 235. Hunk #2 FAILED at 252. 2 out of 2 hunks FAILED tfoerste@t44 ~/devel/linux $ patch -p1 --dry-run < ~/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch checking file fs/btrfs/extent_map.c Hunk #1 FAILED at 235. Hunk #2 FAILED at 252. 2 out of 2 hunks FAILED
On Fri, Nov 27, 2015 at 11:20 AM, Toralf Förster <toralf.foerster@gmx.de> wrote: > On 11/27/2015 12:07 PM, Filipe Manana wrote: >> Try the following (also pasted at >> https://friendpaste.com/5O6o1cqWqJZDIKrH1YqG7y): > > Doesn't apply neither against the used 4.2.6 kernel nor aginst current git HEAD : Quite probable, this was against the integration branch for btrfs. You should be able to apply it manually, it's a trivial change and extent_map.c did not change in any significant way. > > t44 linux # patch -p1 --dry-run < /home/tfoerste/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch > checking file fs/btrfs/extent_map.c > Hunk #1 FAILED at 235. > Hunk #2 FAILED at 252. > 2 out of 2 hunks FAILED > > > tfoerste@t44 ~/devel/linux $ patch -p1 --dry-run < ~/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch > checking file fs/btrfs/extent_map.c > Hunk #1 FAILED at 235. > Hunk #2 FAILED at 252. > 2 out of 2 hunks FAILED > > -- > Toralf, pgp: C4EACDDE 0076E94E
On 11/27/15 12:20, Toralf Förster wrote: > On 11/27/2015 12:07 PM, Filipe Manana wrote: >> Try the following (also pasted at >> https://friendpaste.com/5O6o1cqWqJZDIKrH1YqG7y): > > Doesn't apply neither against the used 4.2.6 kernel nor aginst current git HEAD : > > t44 linux # patch -p1 --dry-run < /home/tfoerste/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch > checking file fs/btrfs/extent_map.c > Hunk #1 FAILED at 235. > Hunk #2 FAILED at 252. > 2 out of 2 hunks FAILED > > > tfoerste@t44 ~/devel/linux $ patch -p1 --dry-run < ~/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch > checking file fs/btrfs/extent_map.c > Hunk #1 FAILED at 235. > Hunk #2 FAILED at 252. > 2 out of 2 hunks FAILED > Toralf, try with --ignore-whitespace, that works for me. Seems the pastebin ate some formatting. -h -- To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On Fri, Nov 27, 2015 at 11:51 AM, Holger Hoffstätte <holger.hoffstaette@googlemail.com> wrote: > On 11/27/15 12:20, Toralf Förster wrote: >> On 11/27/2015 12:07 PM, Filipe Manana wrote: >>> Try the following (also pasted at >>> https://friendpaste.com/5O6o1cqWqJZDIKrH1YqG7y): >> >> Doesn't apply neither against the used 4.2.6 kernel nor aginst current git HEAD : >> >> t44 linux # patch -p1 --dry-run < /home/tfoerste/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch >> checking file fs/btrfs/extent_map.c >> Hunk #1 FAILED at 235. >> Hunk #2 FAILED at 252. >> 2 out of 2 hunks FAILED >> >> >> tfoerste@t44 ~/devel/linux $ patch -p1 --dry-run < ~/Downloads/5O6o1cqWqJZDIKrH1YqG7y.diff.patch >> checking file fs/btrfs/extent_map.c >> Hunk #1 FAILED at 235. >> Hunk #2 FAILED at 252. >> 2 out of 2 hunks FAILED >> > > Toralf, > > try with --ignore-whitespace, that works for me. Seems the pastebin ate > some formatting. Indeed. Try the following instead: http://paste.opensuse.org/view/raw/58412382 thanks > > -h >
On 11/27/2015 12:53 PM, Filipe Manana wrote: > Indeed. > Try the following instead: http://paste.opensuse.org/view/raw/58412382 white-space damaged too, but the hint with --ingore- made it. Will see, if it helps now. But FWIW the mentioned spew happened the first time here AFAICT.
diff --git a/fs/btrfs/extent_map.c b/fs/btrfs/extent_map.c index 6a98bdd..26b4c13 100644 --- a/fs/btrfs/extent_map.c +++ b/fs/btrfs/extent_map.c @@ -235,7 +235,8 @@ static void try_merge_map(struct extent_map_tree *tree, struct extent_map *em) em->start = merge->start; em->orig_start = merge->orig_start; em->len += merge->len; - em->block_len += merge->block_len; + if (em->block_start != EXTENT_MAP_HOLE) + em->block_len += merge->block_len; em->block_start = merge->block_start; em->mod_len = (em->mod_len + em->mod_start) -