From: Ilya Dryomov <idryomov@gmail.com>
To: Arnd Bergmann <arnd@arndb.de>
Cc: Sage Weil <sage@redhat.com>, Alex Elder <elder@kernel.org>,
Jens Axboe <axboe@kernel.dk>,
Jason Dillaman <dillaman@redhat.com>,
Ceph Development <ceph-devel@vger.kernel.org>,
linux-block <linux-block@vger.kernel.org>,
LKML <linux-kernel@vger.kernel.org>
Subject: Re: [PATCH] rdb: convert all rbd_assert(0) to BUG()
Date: Mon, 25 Mar 2019 12:12:09 +0100 [thread overview]
Message-ID: <CAOi1vP_KXQd5=YCGvO4m-WbnPDdpeBS5gTVKkdkBZvR=N-d7fg@mail.gmail.com> (raw)
In-Reply-To: <20190322165404.2859356-1-arnd@arndb.de>
On Fri, Mar 22, 2019 at 5:54 PM Arnd Bergmann <arnd@arndb.de> wrote:
>
> rbd_assert(0) has caused different issues depending on
> the compiler version in the past, so it seems better to avoid it
> completely.
>
> Replace the remaining instances.
>
> Signed-off-by: Arnd Bergmann <arnd@arndb.de>
> ---
> drivers/block/rbd.c | 12 ++++++------
> 1 file changed, 6 insertions(+), 6 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index cbcc3baf3807..564c5069cc78 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -1342,7 +1342,7 @@ static void rbd_obj_zero_range(struct rbd_obj_request *obj_req, u32 off,
> zero_bvecs(&obj_req->bvec_pos, off, bytes);
> break;
> default:
> - rbd_assert(0);
> + BUG();
> }
> }
>
> @@ -1597,7 +1597,7 @@ static void rbd_obj_request_destroy(struct kref *kref)
> kfree(obj_request->bvec_pos.bvecs);
> break;
> default:
> - rbd_assert(0);
> + BUG();
> }
>
> kfree(obj_request->img_extents);
> @@ -1797,7 +1797,7 @@ static void rbd_osd_req_setup_data(struct rbd_obj_request *obj_req, u32 which)
> &obj_req->bvec_pos);
> break;
> default:
> - rbd_assert(0);
> + BUG();
> }
> }
>
> @@ -2052,7 +2052,7 @@ static int __rbd_img_fill_request(struct rbd_img_request *img_req)
> ret = rbd_obj_setup_zeroout(obj_req);
> break;
> default:
> - rbd_assert(0);
> + BUG();
> }
> if (ret < 0)
> return ret;
> @@ -2531,7 +2531,7 @@ static int rbd_obj_issue_copyup_ops(struct rbd_obj_request *obj_req, u32 bytes)
> num_osd_ops += count_zeroout_ops(obj_req);
> break;
> default:
> - rbd_assert(0);
> + BUG();
> }
>
> obj_req->osd_req = rbd_osd_req_create(obj_req, num_osd_ops);
> @@ -2558,7 +2558,7 @@ static int rbd_obj_issue_copyup_ops(struct rbd_obj_request *obj_req, u32 bytes)
> __rbd_obj_setup_zeroout(obj_req, which);
> break;
> default:
> - rbd_assert(0);
> + BUG();
> }
>
> ret = ceph_osdc_alloc_messages(obj_req->osd_req, GFP_NOIO);
Applied.
Thanks,
Ilya
prev parent reply other threads:[~2019-03-25 11:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-22 16:53 [PATCH] rdb: convert all rbd_assert(0) to BUG() Arnd Bergmann
2019-03-25 11:12 ` Ilya Dryomov [this message]
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='CAOi1vP_KXQd5=YCGvO4m-WbnPDdpeBS5gTVKkdkBZvR=N-d7fg@mail.gmail.com' \
--to=idryomov@gmail.com \
--cc=arnd@arndb.de \
--cc=axboe@kernel.dk \
--cc=ceph-devel@vger.kernel.org \
--cc=dillaman@redhat.com \
--cc=elder@kernel.org \
--cc=linux-block@vger.kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=sage@redhat.com \
/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).