From: Anand Jain <anand.jain@oracle.com>
To: Josef Bacik <jbacik@fb.com>,
linux-btrfs@vger.kernel.org, kernel-team@fb.com
Subject: Re: [PATCH] Btrfs: remove BUG_ON()'s in btrfs_map_block
Date: Thu, 14 Apr 2016 10:16:36 +0800 [thread overview]
Message-ID: <570EFD84.90104@oracle.com> (raw)
In-Reply-To: <1460480080-27063-1-git-send-email-jbacik@fb.com>
On 04/13/2016 12:54 AM, Josef Bacik wrote:
> btrfs_map_block can go horribly wrong in the face of fs corruption, lets agree
> to not be assholes and panic at any possible chance things are all fucked up.
>
> Signed-off-by: Josef Bacik <jbacik@fb.com>
> ---
> fs/btrfs/volumes.c | 22 ++++++++++++++++++++--
> 1 file changed, 20 insertions(+), 2 deletions(-)
>
> diff --git a/fs/btrfs/volumes.c b/fs/btrfs/volumes.c
> index e2b54d5..ba8216b 100644
> --- a/fs/btrfs/volumes.c
> +++ b/fs/btrfs/volumes.c
> @@ -5278,7 +5278,18 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
> stripe_nr = div64_u64(stripe_nr, stripe_len);
>
> stripe_offset = stripe_nr * stripe_len;
> - BUG_ON(offset < stripe_offset);
> + if (offset < stripe_offset) {
> + btrfs_crit(fs_info, "stripe math has gone wrong, "
> + "stripe_offset=%llu, offset=%llu, start=%llu, "
> + "logical=%llu, stripe_len=%llu\n",
btrfs_crit adds \n suffix by its own.
> + (unsigned long long)stripe_offset,
> + (unsigned long long)offset,
> + (unsigned long long)em->start,
> + (unsigned long long)logical,
> + (unsigned long long)stripe_len);
> + free_extent_map(em);
> + return -EINVAL;
> + }
>
> /* stripe_offset is the offset of this block in its stripe*/
> stripe_offset = offset - stripe_offset;
> @@ -5519,7 +5530,14 @@ static int __btrfs_map_block(struct btrfs_fs_info *fs_info, int rw,
> &stripe_index);
> mirror_num = stripe_index + 1;
> }
> - BUG_ON(stripe_index >= map->num_stripes);
> + if (stripe_index >= map->num_stripes) {
> + btrfs_crit(fs_info, "stripe index math went horribly wrong, "
> + "got stripe_index=%lu, num_stripes=%lu\n",
-same-
Thanks, Anand
> + (unsigned long)stripe_index,
> + (unsigned long)map->num_stripes);
> + ret = -EINVAL;
> + goto out;
> + }
>
> num_alloc_stripes = num_stripes;
> if (dev_replace_is_ongoing) {
>
next prev parent reply other threads:[~2016-04-14 3:02 UTC|newest]
Thread overview: 3+ messages / expand[flat|nested] mbox.gz Atom feed top
2016-04-12 16:54 [PATCH] Btrfs: remove BUG_ON()'s in btrfs_map_block Josef Bacik
2016-04-14 2:16 ` Anand Jain [this message]
2016-04-27 23:05 ` David Sterba
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=570EFD84.90104@oracle.com \
--to=anand.jain@oracle.com \
--cc=jbacik@fb.com \
--cc=kernel-team@fb.com \
--cc=linux-btrfs@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).