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.c10
1 files changed, 5 insertions, 5 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 7a6694d08874..76917cc3e5a1 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1785,7 +1785,7 @@ static int rbd_img_request_submit(struct rbd_img_request *img_request)
1785 return 0; 1785 return 0;
1786} 1786}
1787 1787
1788static int rbd_obj_notify_ack_sync(struct rbd_device *rbd_dev, 1788static int rbd_obj_notify_ack(struct rbd_device *rbd_dev,
1789 u64 ver, u64 notify_id) 1789 u64 ver, u64 notify_id)
1790{ 1790{
1791 struct rbd_obj_request *obj_request; 1791 struct rbd_obj_request *obj_request;
@@ -1809,11 +1809,11 @@ static int rbd_obj_notify_ack_sync(struct rbd_device *rbd_dev,
1809 goto out; 1809 goto out;
1810 1810
1811 osdc = &rbd_dev->rbd_client->client->osdc; 1811 osdc = &rbd_dev->rbd_client->client->osdc;
1812 obj_request->callback = rbd_obj_request_put;
1812 ret = rbd_obj_request_submit(osdc, obj_request); 1813 ret = rbd_obj_request_submit(osdc, obj_request);
1813 if (!ret)
1814 ret = rbd_obj_request_wait(obj_request);
1815out: 1814out:
1816 rbd_obj_request_put(obj_request); 1815 if (ret)
1816 rbd_obj_request_put(obj_request);
1817 1817
1818 return ret; 1818 return ret;
1819} 1819}
@@ -1835,7 +1835,7 @@ static void rbd_watch_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
1835 rbd_warn(rbd_dev, "got notification but failed to " 1835 rbd_warn(rbd_dev, "got notification but failed to "
1836 " update snaps: %d\n", rc); 1836 " update snaps: %d\n", rc);
1837 1837
1838 rbd_obj_notify_ack_sync(rbd_dev, hver, notify_id); 1838 rbd_obj_notify_ack(rbd_dev, hver, notify_id);
1839} 1839}
1840 1840
1841/* 1841/*