aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block/rbd.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/block/rbd.c')
-rw-r--r--drivers/block/rbd.c9
1 files changed, 5 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7884cb0f7ce..30eb01e300a 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1281,8 +1281,7 @@ fail:
1281/* 1281/*
1282 * Request sync osd unwatch 1282 * Request sync osd unwatch
1283 */ 1283 */
1284static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev, 1284static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev)
1285 const char *object_name)
1286{ 1285{
1287 struct ceph_osd_req_op *ops; 1286 struct ceph_osd_req_op *ops;
1288 1287
@@ -1299,7 +1298,9 @@ static int rbd_req_sync_unwatch(struct rbd_device *rbd_dev,
1299 0, 1298 0,
1300 CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, 1299 CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
1301 ops, 1300 ops,
1302 object_name, 0, 0, NULL, NULL, NULL); 1301 rbd_dev->header_name,
1302 0, 0, NULL, NULL, NULL);
1303
1303 1304
1304 rbd_destroy_ops(ops); 1305 rbd_destroy_ops(ops);
1305 ceph_osdc_cancel_event(rbd_dev->watch_event); 1306 ceph_osdc_cancel_event(rbd_dev->watch_event);
@@ -2567,7 +2568,7 @@ static void rbd_dev_release(struct device *dev)
2567 rbd_dev->watch_request); 2568 rbd_dev->watch_request);
2568 } 2569 }
2569 if (rbd_dev->watch_event) 2570 if (rbd_dev->watch_event)
2570 rbd_req_sync_unwatch(rbd_dev, rbd_dev->header_name); 2571 rbd_req_sync_unwatch(rbd_dev);
2571 2572
2572 rbd_put_client(rbd_dev); 2573 rbd_put_client(rbd_dev);
2573 2574