Skip to contentSkip to conversation

rbd: drop original request earlier for existence check

PATCH Superseded Alex Elder 2 participants 4 messages May 14, 2013 – May 17, 2013

Subsystems (2)
lore
Share & tools
lore

Alex Elder

author
#0 lore raw

PATCH 1/1 rbd: drop original request earlier for existence check

The reference to the original request dropped at the end of rbd_img_obj_exists_callback() corresponds to the reference taken in rbd_img_obj_exists_submit() to account for the stat request referring to it. Move the put of that reference up right after clearing that pointer to make its purpose more obvious.

---
 drivers/block/rbd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/rbd.c +0 -0
index 632dd35..b2f5c96 100644
@@ -2528,6 +2528,7 @@ static void rbd_img_obj_exists_callback(struct

rbd_obj_request *obj_request)
*/
orig_request = obj_request->obj_request;
obj_request->obj_request = NULL;
+ rbd_obj_request_put(orig_request);
rbd_assert(orig_request);
rbd_assert(orig_request->img_request);

@@ -2548,7 +2549,6 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
if (!rbd_dev->parent_overlap) {
struct ceph_osd_client *osdc;

- rbd_obj_request_put(orig_request);
osdc = &rbd_dev->rbd_client->client->osdc; result = rbd_obj_request_submit(osdc, orig_request); if (!result)
@@ -2578,7 +2578,6 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
out:
if (orig_request->result)
rbd_obj_request_complete(orig_request);
- rbd_obj_request_put(orig_request);
}

static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)

Signature · 1 line
1.7.9.5
author
#1 lore raw
Quoted 5 lines · Alex Elder

The reference to the original request dropped at the end of rbd_img_obj_exists_callback() corresponds to the reference taken in rbd_img_obj_exists_submit() to account for the stat request referring to it. Move the put of that reference up right after clearing that pointer to make its purpose more obvious.

This patch and the one I just posted are available in the "review/wip-postflatten" branch of the ceph-client git repository.

-Alex

Quoted 37 lines
---
 drivers/block/rbd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/rbd.c +1 -1
index 632dd35..b2f5c96 100644
@@ -2528,6 +2528,7 @@ static void rbd_img_obj_exists_callback(struct
 rbd_obj_request *obj_request)
 	 */
 	orig_request = obj_request->obj_request;
 	obj_request->obj_request = NULL;
+	rbd_obj_request_put(orig_request);
 	rbd_assert(orig_request);
 	rbd_assert(orig_request->img_request);
@@ -2548,7 +2549,6 @@ static void rbd_img_obj_exists_callback(struct
 rbd_obj_request *obj_request)
 	if (!rbd_dev->parent_overlap) {
 		struct ceph_osd_client *osdc;
 
-		rbd_obj_request_put(orig_request);
 		osdc = &rbd_dev->rbd_client->client->osdc;
 		result = rbd_obj_request_submit(osdc, orig_request);
drivers/block/rbd.c +0 -1
 		if (!result)
@@ -2578,7 +2578,6 @@ static void rbd_img_obj_exists_callback(struct
 rbd_obj_request *obj_request)
 out:
 	if (orig_request->result)
 		rbd_obj_request_complete(orig_request);
-	rbd_obj_request_put(orig_request);
 }
 

static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)

author
#2 lore raw

PATCH v2 1/1 rbd: drop original request earlier for existence check

In reply to Alex Elder

The reference to the original request dropped at the end of rbd_img_obj_exists_callback() corresponds to the reference taken in rbd_img_obj_exists_submit() to account for the stat request referring to it. Move the put of that reference up right after clearing that pointer to make its purpose more obvious.

---
v2: rebased to reflect changes in earlier patches

 drivers/block/rbd.c |    3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/rbd.c +0 -0
index fdbcf04..b4c5e47 100644
@@ -2529,6 +2529,7 @@ static void rbd_img_obj_exists_callback(struct

rbd_obj_request *obj_request)
*/
orig_request = obj_request->obj_request;
obj_request->obj_request = NULL;
+ rbd_obj_request_put(orig_request);
rbd_assert(orig_request);
rbd_assert(orig_request->img_request);

@@ -2549,7 +2550,6 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
if (!rbd_dev->parent_overlap) {
struct ceph_osd_client *osdc;

- rbd_obj_request_put(orig_request);
osdc = &rbd_dev->rbd_client->client->osdc; result = rbd_obj_request_submit(osdc, orig_request); if (!result)
@@ -2579,7 +2579,6 @@ static void rbd_img_obj_exists_callback(struct rbd_obj_request *obj_request)
out:
if (orig_request->result)
rbd_obj_request_complete(orig_request);
- rbd_obj_request_put(orig_request);
}

static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)

Signature · 1 line
1.7.9.5
Reviewed-by on v2 1/1
#3 lore raw
Quoted 45 lines · Alex Elder

The reference to the original request dropped at the end of rbd_img_obj_exists_callback() corresponds to the reference taken in rbd_img_obj_exists_submit() to account for the stat request referring to it. Move the put of that reference up right after clearing that pointer to make its purpose more obvious.

---
v2: rebased to reflect changes in earlier patches

  drivers/block/rbd.c |    3 +--
  1 file changed, 1 insertion(+), 2 deletions(-)
drivers/block/rbd.c +1 -1
index fdbcf04..b4c5e47 100644
@@ -2529,6 +2529,7 @@ static void rbd_img_obj_exists_callback(struct
 rbd_obj_request *obj_request)
  	 */
  	orig_request = obj_request->obj_request;
  	obj_request->obj_request = NULL;
+	rbd_obj_request_put(orig_request);
  	rbd_assert(orig_request);
  	rbd_assert(orig_request->img_request);
@@ -2549,7 +2550,6 @@ static void rbd_img_obj_exists_callback(struct
 rbd_obj_request *obj_request)
  	if (!rbd_dev->parent_overlap) {
  		struct ceph_osd_client *osdc;
 
-		rbd_obj_request_put(orig_request);
  		osdc = &rbd_dev->rbd_client->client->osdc;
  		result = rbd_obj_request_submit(osdc, orig_request);

if (!result)

drivers/block/rbd.c +0 -1
@@ -2579,7 +2579,6 @@ static void rbd_img_obj_exists_callback(struct
 rbd_obj_request *obj_request)
  out:
  	if (orig_request->result)
  		rbd_obj_request_complete(orig_request);
-	rbd_obj_request_put(orig_request);
  }
 

static int rbd_img_obj_exists_submit(struct rbd_obj_request *obj_request)