FAILED: patch "[PATCH] btrfs: release metadata before running delayed refs" failed to apply to 4.4-stable tree
The patch below does not apply to the 4.4-stable tree. If someone wants it applied there, or to any other stable or longterm tree, then please email the backport, including the original git commit id to stable@vger.kernel.org.
thanks,
greg k-h
------------------ original commit in Linus's tree ------------------
From f45c752b65af46bf42963295c332865d95f97fff Mon Sep 17 00:00:00 2001
From: Josef Bacik josef@toxicpanda.com Date: Fri, 28 Sep 2018 07:17:48 -0400 Subject: [PATCH] btrfs: release metadata before running delayed refs
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index cadc747292d9..e7f618b17b07 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1932,6 +1932,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) return ret; }
+ btrfs_trans_release_metadata(trans); + trans->block_rsv = NULL; + /* make a pass through all the delayed refs we have so far * any runnings procs may add more while we are here */ @@ -1941,9 +1944,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) return ret; }
- btrfs_trans_release_metadata(trans); - trans->block_rsv = NULL; - cur_trans = trans->transaction;
/*
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com ---
Hello Greg,
Here is a fixed up backport for upstream commit f45c752b65af46bf42963295c332865d95f97fff This one applies cleanly to 4.4.y and 4.9.y fs/btrfs/transaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index be8eae80ff65..098016338f98 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1821,6 +1821,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, return ret; }
+ btrfs_trans_release_metadata(trans, root); + trans->block_rsv = NULL; + /* make a pass through all the delayed refs we have so far * any runnings procs may add more while we are here */ @@ -1830,9 +1833,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans, return ret; }
- btrfs_trans_release_metadata(trans, root); - trans->block_rsv = NULL; - cur_trans = trans->transaction;
/*
On Tue, Nov 20, 2018 at 10:11:21AM +0200, Nikolay Borisov wrote:
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
Hello Greg,
Here is a fixed up backport for upstream commit f45c752b65af46bf42963295c332865d95f97fff This one applies cleanly to 4.4.y and 4.9.y
What about 4.14.y? I don't want to apply this to only 4.4 and 4.9 and not 4.14. Can you provide a working backport there too?
And I don't see the 2/3 patch in this series, has that already been handled?
thanks,
greg k-h
On 29.11.18 г. 14:21 ч., Greg KH wrote:
On Tue, Nov 20, 2018 at 10:11:21AM +0200, Nikolay Borisov wrote:
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
Hello Greg,
Here is a fixed up backport for upstream commit f45c752b65af46bf42963295c332865d95f97fff This one applies cleanly to 4.4.y and 4.9.y
What about 4.14.y? I don't want to apply this to only 4.4 and 4.9 and not 4.14. Can you provide a working backport there too?
I've only made backports as a result of your "failed to apply" emails. If there isn't a backport for 4.14 then this means it's either handled or you didn't send such an email, or i wasn't cced
And I don't see the 2/3 patch in this series, has that already been handled?
thanks,
greg k-h
On Thu, Nov 29, 2018 at 02:36:05PM +0200, Nikolay Borisov wrote:
On 29.11.18 г. 14:21 ч., Greg KH wrote:
On Tue, Nov 20, 2018 at 10:11:21AM +0200, Nikolay Borisov wrote:
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
Hello Greg,
Here is a fixed up backport for upstream commit f45c752b65af46bf42963295c332865d95f97fff This one applies cleanly to 4.4.y and 4.9.y
What about 4.14.y? I don't want to apply this to only 4.4 and 4.9 and not 4.14. Can you provide a working backport there too?
I've only made backports as a result of your "failed to apply" emails. If there isn't a backport for 4.14 then this means it's either handled or you didn't send such an email, or i wasn't cced
If you got one for older kernels, you should have also gotten one for 4.14, I don't know what failed there, sorry.
Anyway, I need a 4.14 patch before I can apply this one.
thanks,
greg k-h
On Thu, Nov 29, 2018 at 02:36:05PM +0200, Nikolay Borisov wrote:
On 29.11.18 г. 14:21 ч., Greg KH wrote:
On Tue, Nov 20, 2018 at 10:11:21AM +0200, Nikolay Borisov wrote:
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
Hello Greg,
Here is a fixed up backport for upstream commit f45c752b65af46bf42963295c332865d95f97fff This one applies cleanly to 4.4.y and 4.9.y
What about 4.14.y? I don't want to apply this to only 4.4 and 4.9 and not 4.14. Can you provide a working backport there too?
I've only made backports as a result of your "failed to apply" emails. If there isn't a backport for 4.14 then this means it's either handled or you didn't send such an email, or i wasn't cced
And I don't see the 2/3 patch in this series, has that already been handled?
I see commit 2/3 failed to apply on 4.9 and 4.4: https://www.spinics.net/lists/stable/msg267061.html would you send a backport for it as well?
-- Thanks, Sasha
On 3.12.18 г. 17:50 ч., Sasha Levin wrote:
On Thu, Nov 29, 2018 at 02:36:05PM +0200, Nikolay Borisov wrote:
On 29.11.18 г. 14:21 ч., Greg KH wrote:
On Tue, Nov 20, 2018 at 10:11:21AM +0200, Nikolay Borisov wrote:
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
Hello Greg,
Here is a fixed up backport for upstream commit f45c752b65af46bf42963295c332865d95f97fff This one applies cleanly to 4.4.y and 4.9.y
What about 4.14.y? I don't want to apply this to only 4.4 and 4.9 and not 4.14. Can you provide a working backport there too?
I've only made backports as a result of your "failed to apply" emails. If there isn't a backport for 4.14 then this means it's either handled or you didn't send such an email, or i wasn't cced
And I don't see the 2/3 patch in this series, has that already been handled?
I see commit 2/3 failed to apply on 4.9 and 4.4: https://www.spinics.net/lists/stable/msg267061.html would you send a backport for it as well?
I think not, because the memalloc_xxx_save/restore infrastructure is missing and actually plumbing GFP flags to btrfs_iget so that in only 1 unique context we can pass GFP_NOFS will be rather invasive.
-- Thanks, Sasha
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com ---
Hi Greg,
Please apply this backport of upstream commit f45c752b65af46bf42963295c332865d95f97fff to 4.14.y. fs/btrfs/transaction.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/fs/btrfs/transaction.c b/fs/btrfs/transaction.c index f74005ca8f08..73c1fbca0c35 100644 --- a/fs/btrfs/transaction.c +++ b/fs/btrfs/transaction.c @@ -1955,6 +1955,9 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) return ret; }
+ btrfs_trans_release_metadata(trans, fs_info); + trans->block_rsv = NULL; + /* make a pass through all the delayed refs we have so far * any runnings procs may add more while we are here */ @@ -1964,9 +1967,6 @@ int btrfs_commit_transaction(struct btrfs_trans_handle *trans) return ret; }
- btrfs_trans_release_metadata(trans, fs_info); - trans->block_rsv = NULL; - cur_trans = trans->transaction;
/*
On Mon, Dec 03, 2018 at 01:06:57PM +0200, Nikolay Borisov wrote:
From: Josef Bacik josef@toxicpanda.com
We want to release the unused reservation we have since it refills the delayed refs reserve, which will make everything go smoother when running the delayed refs if we're short on our reservation.
CC: stable@vger.kernel.org # 4.4+ Reviewed-by: Omar Sandoval osandov@fb.com Reviewed-by: Liu Bo bo.liu@linux.alibaba.com Reviewed-by: Nikolay Borisov nborisov@suse.com Signed-off-by: Josef Bacik josef@toxicpanda.com Signed-off-by: David Sterba dsterba@suse.com
Hi Greg,
Please apply this backport of upstream commit f45c752b65af46bf42963295c332865d95f97fff to 4.14.y.
I've queued this one for 4.14, and the one you previously sent to 4.9 and 4.4. Thank you.
-- Thanks, Sasha
linux-stable-mirror@lists.linaro.org
-
Greg KH -
gregkh＠linuxfoundation.org
-
Nikolay Borisov -
Sasha Levin