| Message ID | 51043F56.9070500@inktank.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Reviewed-by: Josh Durgin <josh.durgin@inktank.com> On 01/26/2013 12:40 PM, Alex Elder wrote: > Switch to keeping track of the object request pointer rather than > the osd request used to watch the rbd image header object. > > Signed-off-by: Alex Elder <elder@inktank.com> > --- > 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 363a813..4e78402 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -270,7 +270,7 @@ struct rbd_device { > struct ceph_file_layout layout; > > struct ceph_osd_event *watch_event; > - struct ceph_osd_request *watch_request; > + struct rbd_obj_request *watch_request; > > struct rbd_spec *parent_spec; > u64 parent_overlap; > @@ -1728,11 +1728,11 @@ static int rbd_dev_header_watch_sync(struct > rbd_device *rbd_dev, int start) > goto out_cancel; > > if (start) { > - rbd_dev->watch_request = obj_request->osd_req; > - ceph_osdc_set_request_linger(osdc, rbd_dev->watch_request); > + ceph_osdc_set_request_linger(osdc, obj_request->osd_req); > + rbd_dev->watch_request = obj_request; > } else { > ceph_osdc_unregister_linger_request(osdc, > - rbd_dev->watch_request); > + rbd_dev->watch_request->osd_req); > rbd_dev->watch_request = NULL; > } > ret = rbd_obj_request_submit(osdc, obj_request); > -- To unsubscribe from this list: send the line "unsubscribe ceph-devel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 363a813..4e78402 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -270,7 +270,7 @@ struct rbd_device { struct ceph_file_layout layout; struct ceph_osd_event *watch_event; - struct ceph_osd_request *watch_request; + struct rbd_obj_request *watch_request; struct rbd_spec *parent_spec; u64 parent_overlap; @@ -1728,11 +1728,11 @@ static int rbd_dev_header_watch_sync(struct rbd_device *rbd_dev, int start) goto out_cancel; if (start) { - rbd_dev->watch_request = obj_request->osd_req; - ceph_osdc_set_request_linger(osdc, rbd_dev->watch_request); + ceph_osdc_set_request_linger(osdc, obj_request->osd_req); + rbd_dev->watch_request = obj_request; } else { ceph_osdc_unregister_linger_request(osdc, - rbd_dev->watch_request); + rbd_dev->watch_request->osd_req); rbd_dev->watch_request = NULL; }
Switch to keeping track of the object request pointer rather than the osd request used to watch the rbd image header object. Signed-off-by: Alex Elder <elder@inktank.com> --- drivers/block/rbd.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) ret = rbd_obj_request_submit(osdc, obj_request);