Skip to contentSkip to conversation

rbd: Convert to use the preferred fallthrough macro

PATCH Applied Miaohe Lin 3 participants 4 messages Aug 19, 2020

Subsystems (2)
lore
Share & tools
lore

Miaohe Lin

author
#0 lore raw

PATCH 1/1 rbd: Convert to use the preferred fallthrough macro

Convert the uses of fallthrough comments to fallthrough macro.

---
 drivers/block/rbd.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/block/rbd.c +4 -4
index d9c0e7d154f9..011539039693 100644
@@ -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:
Signature · 1 line
2.19.1
maintainer Applied
#1 lore raw
Quoted 1 line · Miaohe Lin

Convert the uses of fallthrough comments to fallthrough macro.

Applied, thanks.

Signature · 1 line
Jens Axboe
maintainer
#2 lore raw
Quoted 5 lines · Jens Axboe
Quoted 1 line · Miaohe Lin

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

maintainer
#3 lore raw
Quoted 11 lines · Ilya Dryomov
Quoted 5 lines · Jens Axboe
Quoted 1 line · Miaohe Lin

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.

Signature · 1 line
Jens Axboe