2020-08-19 08:57:23

by Miaohe Lin

Subject: [PATCH] rbd: Convert to use the preferred fallthrough macro

Convert the uses of fallthrough comments to fallthrough macro.

Signed-off-by: Hongxiang Lou <[email protected]>
Signed-off-by: Miaohe Lin <[email protected]>
---
drivers/block/rbd.c | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index d9c0e7d154f9..011539039693 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3293,7 +3293,7 @@ static bool rbd_obj_advance_copyup(struct rbd_obj_request *obj_req, int *result)
case __RBD_OBJ_COPYUP_OBJECT_MAPS:
if (!pending_result_dec(&obj_req->pending, result))
return false;
- /* fall through */
+ fallthrough;
case RBD_OBJ_COPYUP_OBJECT_MAPS:
if (*result) {
rbd_warn(rbd_dev, "snap object map update failed: %d",
@@ -3312,7 +3312,7 @@ static bool rbd_obj_advance_copyup(struct rbd_obj_request *obj_req, int *result)
case __RBD_OBJ_COPYUP_WRITE_OBJECT:
if (!pending_result_dec(&obj_req->pending, result))
return false;
- /* fall through */
+ fallthrough;
case RBD_OBJ_COPYUP_WRITE_OBJECT:
return true;
default:
@@ -3399,7 +3399,7 @@ static bool rbd_obj_advance_write(struct rbd_obj_request *obj_req, int *result)
case __RBD_OBJ_WRITE_COPYUP:
if (!rbd_obj_advance_copyup(obj_req, result))
return false;
- /* fall through */
+ fallthrough;
case RBD_OBJ_WRITE_COPYUP:
if (*result) {
rbd_warn(rbd_dev, "copyup failed: %d", *result);
@@ -3592,7 +3592,7 @@ static bool rbd_img_advance(struct rbd_img_request *img_req, int *result)
case __RBD_IMG_OBJECT_REQUESTS:
if (!pending_result_dec(&img_req->pending, result))
return false;
- /* fall through */
+ fallthrough;
case RBD_IMG_OBJECT_REQUESTS:
return true;
default:
--
2.19.1

2020-08-19 13:06:00

by Jens Axboe

Subject: Re: [PATCH] rbd: Convert to use the preferred fallthrough macro

On 8/19/20 1:53 AM, Miaohe Lin wrote:
> Convert the uses of fallthrough comments to fallthrough macro.

Applied, thanks.

--
Jens Axboe

2020-08-19 13:32:41

by Ilya Dryomov

Subject: Re: [PATCH] rbd: Convert to use the preferred fallthrough macro

On Wed, Aug 19, 2020 at 3:03 PM Jens Axboe <[email protected]> wrote:
>
> On 8/19/20 1:53 AM, Miaohe Lin wrote:
> > Convert the uses of fallthrough comments to fallthrough macro.
>
> Applied, thanks.

Hi Jens,

This has already been folded into another patch in ceph-client.git.
Please drop it.

Thanks,

Ilya

2020-08-19 13:34:32

by Jens Axboe

Subject: Re: [PATCH] rbd: Convert to use the preferred fallthrough macro

On 8/19/20 6:31 AM, Ilya Dryomov wrote:
> On Wed, Aug 19, 2020 at 3:03 PM Jens Axboe <[email protected]> wrote:
>>
>> On 8/19/20 1:53 AM, Miaohe Lin wrote:
>>> Convert the uses of fallthrough comments to fallthrough macro.
>>
>> Applied, thanks.
>
> Hi Jens,
>
> This has already been folded into another patch in ceph-client.git.
> Please drop it.

Dropped.

--
Jens Axboe