Btrfs for stable (mostly 3.17)
Hi everyone,
I've pulled out some of the btrfs commits from the merge window that we'd like to see in stable. The full list of sha's from Linus is below, you can see 4 of them are only needed on 3.17
2fad4e83e12591eb3bd213875b9edc2d18e933830b4699dcb65c2cff793210b07f40b98c2d423a43 # v3.1712b894cb288d57292b01cf158177b6d5c89a627278a017a2c92df9b571db0a55a016280f9019c65e4d1a40c66bed0b3fa43b9da5fbd5cbe332e4eccfe6c4efd87ab04e5ead363f24e6ac35ed3506d401 # v3.17f6acfd50110b335c7af636cf1fc8e55319cae5fc1d52c78afbbf80b58299e076a159617d6b42fe3c75bfb9aff45e44625260f52a5fd581b92ace3e62bbe9051441effce51c9a533d2c56440df64db2d732be3a1ac6d09576c57063c6c350ca36eaebdbd3 # v3.1742383020beb1cfb05f5d330cc311931bc4917a97d37973082b453ba6b89ec07eb7b84305895d35e1 # v3.17
I've made a git branch (stable-3.17) with all of these cherry picked out:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.git stable-3.17
They all cherry pick cleanly, so the git tree is mostly for btrfs users who wanted a recent corruption fix. Feel free to pull or feed the shas into your scripts. The last one (d37973082b) was already tagged for stable, so you've probably got it already through the regular channels. It shouldn't need special ordering.
Josef Bacik (4) commits (+72/-32):
Btrfs: fix build_backref_tree issue with multiple shared blocks (+4/-1)
Btrfs: cleanup error handling in build_backref_tree (+59/-29)
Btrfs: don't do async reclaim during log replay (+7/-1)
Btrfs: try not to ENOSPC on log replay (+2/-1)
Qu Wenruo (3) commits (+60/-24):
btrfs: Fix and enhance merge_extent_mapping() to insert best fitted extent map (+57/-22)
btrfs: Fix the wrong condition judgment about subset extent map (+1/-1)
btrfs: Fix a deadlock in btrfs_dev_replace_finishing() (+2/-1)
Filipe Manana (1) commits (+3/-0):
Btrfs: add missing compression property remove in btrfs_ioctl_setflags
Sage Weil (1) commits (+9/-3):
Btrfs: fix race in WAIT_SYNC ioctl
Mark Fasheh (1) commits (+8/-2):
btrfs: don't go readonly on existing qgroup items
Liu Bo (1) commits (+15/-10):
Btrfs: fix up bounds checking in lseek
Chris Mason (1) commits (+33/-36):
Revert "Btrfs: race free update of commit root for ro snapshots"
David Sterba (1) commits (+6/-0):
btrfs: wake up transaction thread from SYNC_FS ioctl
Total: (13) commits (+206/-107)
fs/btrfs/dev-replace.c | 3 +- fs/btrfs/extent-tree.c | 8 +++- fs/btrfs/file.c | 25 ++++++----- fs/btrfs/inode.c | 118 ++++++++++++++++++++++++------------------------- fs/btrfs/ioctl.c | 42 ++++++++++++++++++ fs/btrfs/qgroup.c | 10 ++++- fs/btrfs/relocation.c | 93 +++++++++++++++++++++++++------------- fs/btrfs/transaction.c | 12 +++-- 8 files changed, 205 insertions(+), 106 deletions(-)
Quoted 6 lines · Chris Mason
Hi everyone,
I've pulled out some of the btrfs commits from the merge window that we'd like to see in stable. The full list of sha's from Linus is below, you can see 4 of them are only needed on 3.17
Quoted 13 lines
2fad4e83e12591eb3bd213875b9edc2d18e933830b4699dcb65c2cff793210b07f40b98c2d423a43# v3.1712b894cb288d57292b01cf158177b6d5c89a627278a017a2c92df9b571db0a55a016280f9019c65e4d1a40c66bed0b3fa43b9da5fbd5cbe332e4eccfe6c4efd87ab04e5ead363f24e6ac35ed3506d401# v3.17f6acfd50110b335c7af636cf1fc8e55319cae5fc1d52c78afbbf80b58299e076a159617d6b42fe3c75bfb9aff45e44625260f52a5fd581b92ace3e62bbe9051441effce51c9a533d2c56440df64db2d732be3a1ac6d09576c57063c6c350ca36eaebdbd3# v3.1742383020beb1cfb05f5d330cc311931bc4917a97d37973082b453ba6b89ec07eb7b84305895d35e1# v3.17
I'm confused, the others not marked with a "# v3.17" need to go on older kernels as well?
Quoted 9 lines
I've made a git branch (stable-3.17) with all of these cherry picked out:
git://git.kernel.org/pub/scm/linux/kernel/git/mason/linux-btrfs.gitstable-3.17They all cherry pick cleanly, so the git tree is mostly for btrfs users who wanted a recent corruption fix. Feel free to pull or feed the shas into your scripts. The last one (
d37973082b) was already tagged for stable, so you've probably got it already through the regular channels. It shouldn't need special ordering.
Ok, thanks, I'll just feed these sha1s to my scripts, it's easier that way.
greg k-h
Quoted 21 lines · Greg KH
Quoted 6 lines · Chris Mason
Hi everyone,
I've pulled out some of the btrfs commits from the merge window that we'd like to see in stable. The full list of sha's from Linus is below, you can see 4 of them are only needed on 3.17
Quoted 13 lines
2fad4e83e12591eb3bd213875b9edc2d18e933830b4699dcb65c2cff793210b07f40b98c2d423a43# v3.1712b894cb288d57292b01cf158177b6d5c89a627278a017a2c92df9b571db0a55a016280f9019c65e4d1a40c66bed0b3fa43b9da5fbd5cbe332e4eccfe6c4efd87ab04e5ead363f24e6ac35ed3506d401# v3.17f6acfd50110b335c7af636cf1fc8e55319cae5fc1d52c78afbbf80b58299e076a159617d6b42fe3c75bfb9aff45e44625260f52a5fd581b92ace3e62bbe9051441effce51c9a533d2c56440df64db2d732be3a1ac6d09576c57063c6c350ca36eaebdbd3# v3.1742383020beb1cfb05f5d330cc311931bc4917a97d37973082b453ba6b89ec07eb7b84305895d35e1# v3.17
Quoted 2 lines
I'm confused, the others not marked with a "# v3.17" need to go on older kernels as well?
I've picked up the ones that apply and build for the older stable kernels I maintain now, thanks for the list.
greg k-h
Quoted 22 lines · Greg KH
Quoted 21 lines · Greg KH
Quoted 19 lines · Chris Mason
Hi everyone,
I've pulled out some of the btrfs commits from the merge window that we'd like to see in stable. The full list of sha's from Linus is below, you can see 4 of them are only needed on 3.17
2fad4e83e12591eb3bd213875b9edc2d18e933830b4699dcb65c2cff793210b07f40b98c2d423a43# v3.1712b894cb288d57292b01cf158177b6d5c89a627278a017a2c92df9b571db0a55a016280f9019c65e4d1a40c66bed0b3fa43b9da5fbd5cbe332e4eccfe6c4efd87ab04e5ead363f24e6ac35ed3506d401# v3.17f6acfd50110b335c7af636cf1fc8e55319cae5fc1d52c78afbbf80b58299e076a159617d6b42fe3c75bfb9aff45e44625260f52a5fd581b92ace3e62bbe9051441effce51c9a533d2c56440df64db2d732be3a1ac6d09576c57063c6c350ca36eaebdbd3# v3.1742383020beb1cfb05f5d330cc311931bc4917a97d37973082b453ba6b89ec07eb7b84305895d35e1# v3.17
Quoted 5 lines
Quoted 2 lines
I'm confused, the others not marked with a "# v3.17" need to go on older kernels as well?
I've picked up the ones that apply and build for the older stable kernels I maintain now, thanks for the list.
May I suggest porting the following commit to 3.14 too?
It fixes a data corruption issue for an incremental send. Particularly important, IMHO, as the corruption happens silently (no errors returned to user space nor any sort of warnings/errors in syslog, etc). It affects only 3.14, and the change applies cleanly on 3.14.22.
Thanks
Quoted 7 lines
greg k-h
--
To unsubscribe from this list: send the line "unsubscribe linux-btrfs" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html
Quoted 24 lines · Greg KH
Quoted 23 lines · Greg KH
Quoted 3 lines · Chris Mason
Hi everyone,
I've pulled out some of the btrfs commits from the merge window
that
Quoted 1 line
we'd like to see in stable. The full list of sha's from Linus is
below,
Quoted 15 lines
you can see 4 of them are only needed on 3.17
2fad4e83e12591eb3bd213875b9edc2d18e933830b4699dcb65c2cff793210b07f40b98c2d423a43# v3.1712b894cb288d57292b01cf158177b6d5c89a627278a017a2c92df9b571db0a55a016280f9019c65e4d1a40c66bed0b3fa43b9da5fbd5cbe332e4eccfe6c4efd87ab04e5ead363f24e6ac35ed3506d401# v3.17f6acfd50110b335c7af636cf1fc8e55319cae5fc1d52c78afbbf80b58299e076a159617d6b42fe3c75bfb9aff45e44625260f52a5fd581b92ace3e62bbe9051441effce51c9a533d2c56440df64db2d732be3a1ac6d09576c57063c6c350ca36eaebdbd3# v3.1742383020beb1cfb05f5d330cc311931bc4917a97d37973082b453ba6b89ec07eb7b84305895d35e1# v3.17
Quoted 6 lines
Quoted 3 lines
I'm confused, the others not marked with a "# v3.17" need to go on
older
kernels as well?I've picked up the ones that apply and build for the older stable kernels I maintain now, thanks for the list.
Sorry I wasn't clear. The other unmarked ones should go back to the older kernels as well.
-chris
Quoted 31 lines · Filipe Manana
Quoted 22 lines · Greg KH
Quoted 21 lines · Greg KH
Quoted 19 lines · Chris Mason
Hi everyone,
I've pulled out some of the btrfs commits from the merge window that we'd like to see in stable. The full list of sha's from Linus is below, you can see 4 of them are only needed on 3.17
2fad4e83e12591eb3bd213875b9edc2d18e933830b4699dcb65c2cff793210b07f40b98c2d423a43# v3.1712b894cb288d57292b01cf158177b6d5c89a627278a017a2c92df9b571db0a55a016280f9019c65e4d1a40c66bed0b3fa43b9da5fbd5cbe332e4eccfe6c4efd87ab04e5ead363f24e6ac35ed3506d401# v3.17f6acfd50110b335c7af636cf1fc8e55319cae5fc1d52c78afbbf80b58299e076a159617d6b42fe3c75bfb9aff45e44625260f52a5fd581b92ace3e62bbe9051441effce51c9a533d2c56440df64db2d732be3a1ac6d09576c57063c6c350ca36eaebdbd3# v3.1742383020beb1cfb05f5d330cc311931bc4917a97d37973082b453ba6b89ec07eb7b84305895d35e1# v3.17Quoted 5 lines
Quoted 2 lines
I'm confused, the others not marked with a "# v3.17" need to go on older kernels as well?
I've picked up the ones that apply and build for the older stable kernels I maintain now, thanks for the list.
Quoted 8 lines
May I suggest porting the following commit to 3.14 too?
It fixes a data corruption issue for an incremental send. Particularly important, IMHO, as the corruption happens silently (no errors returned to user space nor any sort of warnings/errors in syslog, etc). It affects only 3.14, and the change applies cleanly on 3.14.22.
Chris, any objection for me taking this?
thanks,
greg k-h
Quoted 7 lines · Greg KH
Quoted 5 lines · Filipe Manana
May I suggest porting the following commit to 3.14 too?
Quoted 8 lines
Quoted 6 lines
It fixes a data corruption issue for an incremental send.
Particularly
important, IMHO, as the corruption happens silently (no errors
returned
to user space nor any sort of warnings/errors in syslog, etc). It affects only 3.14, and the change applies cleanly on 3.14.22.Chris, any objection for me taking this?
On vacation, sorry for the lag. Please do take this one too. Thanks Filipe.
-chris
Quoted 14 lines · Chris Mason
Quoted 11 lines · Greg KH
Quoted 8 lines · Filipe Manana
May I suggest porting the following commit to 3.14 too?
It fixes a data corruption issue for an incremental send. Particularly important, IMHO, as the corruption happens silently (no errors returned to user space nor any sort of warnings/errors in syslog, etc). It affects only 3.14, and the change applies cleanly on 3.14.22.
Quoted 4 lines
Quoted 1 line
Chris, any objection for me taking this?
On vacation, sorry for the lag. Please do take this one too. Thanks Filipe.
Great, now applied.
greg k-h