[24/47] block-rbd: Rename jump labels in rbd_request_lock()

Commit Message

SF Markus Elfring Sept. 12, 2016, 7:10 p.m. UTC

From: Markus Elfring <[e-mail]>
Date: Mon, 12 Sep 2016 19:38:52 +0200

Adjust jump labels according to the current Linux coding style convention.

Signed-off-by: Markus Elfring <[e-mail]>
---
 drivers/block/rbd.c | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

Patch

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index e175d21..09a0ed3 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -3297,7 +3297,7 @@  static int rbd_request_lock(struct rbd_device *rbd_dev)
 				   &reply_pages, &reply_len);
 	if (ret && ret != -ETIMEDOUT) {
 		rbd_warn(rbd_dev, "failed to request lock: %d", ret);
-		goto out;
+		goto release_page_vector;
 	}
 
 	if (reply_len > 0 && reply_len <= PAGE_SIZE) {
@@ -3321,7 +3321,7 @@  static int rbd_request_lock(struct rbd_device *rbd_dev)
 				rbd_warn(rbd_dev,
 					 "duplicate lock owners detected");
 				ret = -EIO;
-				goto out;
+				goto release_page_vector;
 			}
 
 			lock_owner_responded = true;
@@ -3342,14 +3342,12 @@  static int rbd_request_lock(struct rbd_device *rbd_dev)
 		rbd_warn(rbd_dev, "no lock owners detected");
 		ret = -ETIMEDOUT;
 	}
-
-out:
+ release_page_vector:
 	ceph_release_page_vector(reply_pages, calc_pages_for(0, reply_len));
 	return ret;
-
-e_inval:
+ e_inval:
 	ret = -EINVAL;
-	goto out;
+	goto release_page_vector;
 }
 
 static void wake_requests(struct rbd_device *rbd_dev, bool wake_all)