Hi stable team, please add the following commits to 3.11 tree, they fix user visible problems, were tested and are now present in 3.12-rc1. 3d05ca371200b3366530621abf73769024581b79 b13a004528c3e5eb060a26eee795f5a0da7bfe9f 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aa Josef Bacik (4): Btrfs: reset ret in record_one_backref Btrfs: change how we queue blocks for backref checking Btrfs: skip subvol entries when checking if we''ve created a dir already Btrfs: remove ourselves from the cluster list under lock fs/btrfs/extent-tree.c | 3 ++- fs/btrfs/inode.c | 3 +-- fs/btrfs/relocation.c | 14 +++++++------- fs/btrfs/send.c | 3 ++- 4 files changed, 12 insertions(+), 11 deletions(-)
On Fri, Sep 20, 2013 at 06:34:39PM +0200, David Sterba wrote:> Hi stable team, > > please add the following commits to 3.11 tree, they fix user visible problems, > were tested and are now present in 3.12-rc1. > > 3d05ca371200b3366530621abf73769024581b79 > b13a004528c3e5eb060a26eee795f5a0da7bfe9f > 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca > ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aa > > Josef Bacik (4): > Btrfs: reset ret in record_one_backref > Btrfs: change how we queue blocks for backref checking > Btrfs: skip subvol entries when checking if we''ve created a dir already > Btrfs: remove ourselves from the cluster list under lockThanks for this, I''ll queue them up soon. Are any of these applicable for 3.10 as well? greg k-h
Quoting David Sterba (2013-09-20 12:34:39)> Hi stable team, > > please add the following commits to 3.11 tree, they fix user visible problems, > were tested and are now present in 3.12-rc1. > > 3d05ca371200b3366530621abf73769024581b79 > b13a004528c3e5eb060a26eee795f5a0da7bfe9f > 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca > ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aaThanks Dave, I''ll pull these into a -stable tree and send a pull request. -chris
On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote:> On Fri, Sep 20, 2013 at 06:34:39PM +0200, David Sterba wrote: > > 3d05ca371200b3366530621abf73769024581b79 > > b13a004528c3e5eb060a26eee795f5a0da7bfe9f > > 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca > > ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aa > > > > Josef Bacik (4): > > Btrfs: reset ret in record_one_backref > > Btrfs: change how we queue blocks for backref checking > > Btrfs: skip subvol entries when checking if we''ve created a dir already > > Btrfs: remove ourselves from the cluster list under lock > > Thanks for this, I''ll queue them up soon. Are any of these applicable > for 3.10 as well?The first one is not applicable. These two apply directly (3rd, 4th): Btrfs: skip subvol entries when checking if we''ve created a dir already 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca Btrfs: remove ourselves from the cluster list under lock ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aa I''m no sure about the 2nd, this one leads to crash in 3.11 but I''m not aware of any 3.10.x report, so ti could be affected by later changes. Josef knows better. Btrfs: change how we queue blocks for backref checking b13a004528c3e5eb060a26eee795f5a0da7bfe9f thanks, david
Hi Greg, On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote:> Thanks for this, I''ll queue them up soon.3.11.3 has been just released and the btrfs fixes are not there nor in the stable-queue git repo. There''s a fix for a crash that affects a number of users. Please queue the patches or let me know what''s needed to get them to stable tree. thanks, david -- 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 Tue, Oct 01, 2013 at 07:03:44PM +0200, David Sterba wrote:> Hi Greg, > > On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote: > > Thanks for this, I''ll queue them up soon. > > 3.11.3 has been just released and the btrfs fixes are not there nor in > the stable-queue git repo. There''s a fix for a crash that affects > a number of users. Please queue the patches or let me know what''s needed > to get them to stable tree.Chris implied that he was going to add them to a tree and then send them on to me. So I was waiting. If this isn''t the case, I''ll be glad to queue them up for the next round of kernels. Chris, any opinions? Either way is fine for me, it''s your call. thanks, greg k-h
Sorry, I misunderstood and thought you had already queued them. Both are fine with me. -chris ________________________________________ From: Greg KH [gregkh@linuxfoundation.org] Sent: Tuesday, October 01, 2013 1:49 PM To: dsterba@suse.cz; stable@vger.kernel.org; Josef Bacik; Chris Mason; linux-btrfs@vger.kernel.org Subject: Re: Handful of btrfs fixes for 3.11.x stable On Tue, Oct 01, 2013 at 07:03:44PM +0200, David Sterba wrote:> Hi Greg, > > On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote: > > Thanks for this, I''ll queue them up soon. > > 3.11.3 has been just released and the btrfs fixes are not there nor in > the stable-queue git repo. There''s a fix for a crash that affects > a number of users. Please queue the patches or let me know what''s needed > to get them to stable tree.Chris implied that he was going to add them to a tree and then send them on to me. So I was waiting. If this isn''t the case, I''ll be glad to queue them up for the next round of kernels. Chris, any opinions? Either way is fine for me, it''s your call. thanks, greg k-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 Wed, Oct 02, 2013 at 01:15:19AM +0000, Chris Mason wrote:> Sorry, > > I misunderstood and thought you had already queued them. Both are fine with me.Ok, no worries, I''ll pick them up in the next few days and add them to the next stable releases. thanks, greg k-h
On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote:> On Fri, Sep 20, 2013 at 06:34:39PM +0200, David Sterba wrote: > > Hi stable team, > > > > please add the following commits to 3.11 tree, they fix user visible problems, > > were tested and are now present in 3.12-rc1. > > > > 3d05ca371200b3366530621abf73769024581b79 > > b13a004528c3e5eb060a26eee795f5a0da7bfe9f > > 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca > > ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aaThese git commit ids don''t match up to anything in Linus''s tree, where did you get them from?> > Josef Bacik (4): > > Btrfs: reset ret in record_one_backref > > Btrfs: change how we queue blocks for backref checking > > Btrfs: skip subvol entries when checking if we''ve created a dir already > > Btrfs: remove ourselves from the cluster list under lockI can dig through the tree to find these, but I''d prefer if you could provide the correct ids to verify I got them right. Also, what order do I apply them in? thanks, greg k-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 Sat, Oct 05, 2013 at 04:52:18PM -0700, Greg KH wrote:> On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote: > > On Fri, Sep 20, 2013 at 06:34:39PM +0200, David Sterba wrote: > > > Hi stable team, > > > > > > please add the following commits to 3.11 tree, they fix user visible problems, > > > were tested and are now present in 3.12-rc1. > > > > > > 3d05ca371200b3366530621abf73769024581b79 > > > b13a004528c3e5eb060a26eee795f5a0da7bfe9f > > > 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca > > > ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aa > > These git commit ids don''t match up to anything in Linus''s tree, where > did you get them from? > > > > Josef Bacik (4): > > > Btrfs: reset ret in record_one_backref > > > Btrfs: change how we queue blocks for backref checking > > > Btrfs: skip subvol entries when checking if we''ve created a dir already > > > Btrfs: remove ourselves from the cluster list under lock > > I can dig through the tree to find these, but I''d prefer if you could > provide the correct ids to verify I got them right. > > Also, what order do I apply them in?You can commit them in that order (top to bottom), here are their corresponding commits 50f1319cb5f7690e4d9de18d1a75ea89296d0e53 b6c60c8018c4e9beb2f83fc82c09f9d033766571 a05254143cd183b18002cbba7759a1e4629aa762 b8d0c69b9469ffd33df30fee3e990f2d4aa68a09 Thanks, Josef
On Mon, Oct 07, 2013 at 04:34:43PM -0400, Josef Bacik wrote:> On Sat, Oct 05, 2013 at 04:52:18PM -0700, Greg KH wrote: > > On Fri, Sep 20, 2013 at 09:53:02AM -0700, Greg KH wrote: > > > On Fri, Sep 20, 2013 at 06:34:39PM +0200, David Sterba wrote: > > > > Hi stable team, > > > > > > > > please add the following commits to 3.11 tree, they fix user visible problems, > > > > were tested and are now present in 3.12-rc1. > > > > > > > > 3d05ca371200b3366530621abf73769024581b79 > > > > b13a004528c3e5eb060a26eee795f5a0da7bfe9f > > > > 7ef67ffda91cc0c56f33937bfdf1d057b9ee96ca > > > > ca6d07c1d74bf7ba3083bc31a9aeeaa1d0ad86aa > > > > These git commit ids don''t match up to anything in Linus''s tree, where > > did you get them from? > > > > > > Josef Bacik (4): > > > > Btrfs: reset ret in record_one_backref > > > > Btrfs: change how we queue blocks for backref checking > > > > Btrfs: skip subvol entries when checking if we''ve created a dir already > > > > Btrfs: remove ourselves from the cluster list under lock > > > > I can dig through the tree to find these, but I''d prefer if you could > > provide the correct ids to verify I got them right. > > > > Also, what order do I apply them in? > > You can commit them in that order (top to bottom), here are their corresponding > commits > > 50f1319cb5f7690e4d9de18d1a75ea89296d0e53 > b6c60c8018c4e9beb2f83fc82c09f9d033766571 > a05254143cd183b18002cbba7759a1e4629aa762 > b8d0c69b9469ffd33df30fee3e990f2d4aa68a09All now applied, thanks. greg k-h