Commit 070c633f authored by Alex Elder's avatar Alex Elder Committed by Sage Weil

rbd: drop "object_name" from rbd_req_sync_unwatch()

rbd_req_sync_unwatch() only ever uses rbd_dev->header_name as the
value of its "object_name" parameter, and that value is available
within the function already.  So get rid of the parameter.
Signed-off-by: default avatarAlex Elder <elder@inktank.com>
Reviewed-by: default avatarJosh Durgin <josh.durgin@inktank.com>
parent 7f0a24d8
...@@ -1281,8 +1281,7 @@ static int rbd_req_sync_watch(struct rbd_device *rbd_dev) ...@@ -1281,8 +1281,7 @@ static int rbd_req_sync_watch(struct rbd_device *rbd_dev)
/* /*
* Request sync osd unwatch * Request sync osd unwatch
*/ */
static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev, static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev)
const char *object_name)
{ {
struct ceph_osd_req_op *ops; struct ceph_osd_req_op *ops;
...@@ -1299,7 +1298,9 @@ static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev, ...@@ -1299,7 +1298,9 @@ static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev,
0, 0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops, ops,
object_name, 0, 0, NULL, NULL, NULL); rbd_dev->header_name,
0, 0, NULL, NULL, NULL);
rbd_destroy_ops(ops); rbd_destroy_ops(ops);
ceph_osdc_cancel_event(rbd_dev->watch_event); ceph_osdc_cancel_event(rbd_dev->watch_event);
...@@ -2567,7 +2568,7 @@ static void rbd_dev_release(struct device *dev) ...@@ -2567,7 +2568,7 @@ static void rbd_dev_release(struct device *dev)
rbd_dev->watch_request); rbd_dev->watch_request);
} }
if (rbd_dev->watch_event) if (rbd_dev->watch_event)
rbd_req_sync_unwatch(rbd_dev, rbd_dev->header_name); rbd_req_sync_unwatch(rbd_dev);
rbd_put_client(rbd_dev); rbd_put_client(rbd_dev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment