From: Edmund Nadolski <enadolski@suse.de>
To: jeffm@suse.com, linux-btrfs@vger.kernel.org
Cc: stable@vger.kernel.org
Subject: Re: [PATCH] btrfs: handle errors while updating refcounts in update_ref_for_cow
Date: Tue, 21 Nov 2017 14:40:36 -0700 [thread overview]
Message-ID: <e217db3d-ee82-699e-17bd-8922f489787f@suse.de> (raw)
In-Reply-To: <20171121185849.22602-1-jeffm@suse.com>
On 11/21/2017 11:58 AM, jeffm@suse.com wrote:
> From: Jeff Mahoney <jeffm@suse.com>
>
> Since commit fb235dc06fa (btrfs: qgroup: Move half of the qgroup
> accounting time out of commit trans) the assumption that
> btrfs_add_delayed_{data,tree}_ref can only return 0 or -ENOMEM has
> been false. The qgroup operations call into btrfs_search_slot
> and friends and can now return the full spectrum of error codes.
>
> Fortunately, the fix here is easy since update_ref_for_cow failing
> is already handled so we just need to bail early with the error
> code.
>
> Fixes: fb235dc06fa (btrfs: qgroup: Move half of the qgroup accounting ...)
> Cc: <stable@vger.kernel.org> # v4.11+
> Signed-off-by: Jeff Mahoney <jeffm@suse.com>
Reviewed-by: Edmund Nadolski <enadolski@suse.com>
> ---
> fs/btrfs/ctree.c | 18 ++++++++++++------
> 1 file changed, 12 insertions(+), 6 deletions(-)
>
> diff --git a/fs/btrfs/ctree.c b/fs/btrfs/ctree.c
> index 531e0a8645b0..1e74cf826532 100644
> --- a/fs/btrfs/ctree.c
> +++ b/fs/btrfs/ctree.c
> @@ -1032,14 +1032,17 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
> root->root_key.objectid == BTRFS_TREE_RELOC_OBJECTID) &&
> !(flags & BTRFS_BLOCK_FLAG_FULL_BACKREF)) {
> ret = btrfs_inc_ref(trans, root, buf, 1);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + return ret;
>
> if (root->root_key.objectid ==
> BTRFS_TREE_RELOC_OBJECTID) {
> ret = btrfs_dec_ref(trans, root, buf, 0);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + return ret;
> ret = btrfs_inc_ref(trans, root, cow, 1);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + return ret;
> }
> new_flags |= BTRFS_BLOCK_FLAG_FULL_BACKREF;
> } else {
> @@ -1049,7 +1052,8 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
> ret = btrfs_inc_ref(trans, root, cow, 1);
> else
> ret = btrfs_inc_ref(trans, root, cow, 0);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + return ret;
> }
> if (new_flags != 0) {
> int level = btrfs_header_level(buf);
> @@ -1068,9 +1072,11 @@ static noinline int update_ref_for_cow(struct btrfs_trans_handle *trans,
> ret = btrfs_inc_ref(trans, root, cow, 1);
> else
> ret = btrfs_inc_ref(trans, root, cow, 0);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + return ret;
> ret = btrfs_dec_ref(trans, root, buf, 1);
> - BUG_ON(ret); /* -ENOMEM */
> + if (ret)
> + return ret;
> }
> clean_tree_block(fs_info, buf);
> *last_ref = 1;
>
next prev parent reply other threads:[~2017-11-21 21:40 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-11-21 18:58 [PATCH] btrfs: handle errors while updating refcounts in update_ref_for_cow jeffm
2017-11-21 21:40 ` Edmund Nadolski [this message]
2017-11-22 9:06 ` Qu Wenruo
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=e217db3d-ee82-699e-17bd-8922f489787f@suse.de \
--to=enadolski@suse.de \
--cc=jeffm@suse.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=stable@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).