aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/block
diff options
context:
space:
mode:
authorAlex Elder <elder@inktank.com>2013-01-20 15:44:42 -0500
committerSage Weil <sage@inktank.com>2013-02-13 21:29:08 -0500
commit86ea43bfcbeae61858b0fee4971e5b1e894d7174 (patch)
tree8670fc7df04991ebf4eae1ba91ac484264717e53 /drivers/block
parent788e2df3b92e30f1fff74139bb53e68ec13fe2a5 (diff)
rbd: get rid of rbd_req_sync_read()
Delete rbd_req_sync_read() is no longer used, so get rid of it. Signed-off-by: Alex Elder <elder@inktank.com> Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r--drivers/block/rbd.c24
1 files changed, 0 insertions, 24 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 3f5eaea444a0..5e7110a50513 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1315,29 +1315,6 @@ static void rbd_obj_request_complete(struct rbd_obj_request *obj_request)
1315} 1315}
1316 1316
1317/* 1317/*
1318 * Synchronously read a range from an object into a provided buffer
1319 */
1320static int rbd_req_sync_read(struct rbd_device *rbd_dev,
1321 const char *object_name,
1322 u64 ofs, u64 len,
1323 char *buf,
1324 u64 *ver)
1325{
1326 struct ceph_osd_req_op *op;
1327 int ret;
1328
1329 op = rbd_osd_req_op_create(CEPH_OSD_OP_READ, ofs, len);
1330 if (!op)
1331 return -ENOMEM;
1332
1333 ret = rbd_req_sync_op(rbd_dev, CEPH_OSD_FLAG_READ,
1334 op, object_name, ofs, len, buf, ver);
1335 rbd_osd_req_op_destroy(op);
1336
1337 return ret;
1338}
1339
1340/*
1341 * Request sync osd watch 1318 * Request sync osd watch
1342 */ 1319 */
1343static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev, 1320static int rbd_req_sync_notify_ack(struct rbd_device *rbd_dev,
@@ -2112,7 +2089,6 @@ rbd_dev_v1_header_read(struct rbd_device *rbd_dev, u64 *version)
2112 if (!ondisk) 2089 if (!ondisk)
2113 return ERR_PTR(-ENOMEM); 2090 return ERR_PTR(-ENOMEM);
2114 2091
2115 (void) rbd_req_sync_read; /* avoid a warning */
2116 ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_name, 2092 ret = rbd_obj_read_sync(rbd_dev, rbd_dev->header_name,
2117 0, size, 2093 0, size,
2118 (char *) ondisk, version); 2094 (char *) ondisk, version);