diff options
author | Alex Elder <elder@inktank.com> | 2012-07-25 10:32:40 -0400 |
---|---|---|
committer | Sage Weil <sage@inktank.com> | 2012-07-30 21:15:53 -0400 |
commit | 4cb162508afade6d24d58e30be2bbaed80cf84d5 (patch) | |
tree | 3ab51bcb873c99457bc035214c7a50e1b25de96e /drivers/block | |
parent | 0e6f322d550a104b2065288c9f6426d5c0414b76 (diff) |
rbd: drop "object_name" from rbd_req_sync_notify()
rbd_req_sync_notify() 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: Alex Elder <elder@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
Diffstat (limited to 'drivers/block')
-rw-r--r-- | drivers/block/rbd.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index b8e557fbf73b..d187d087a505 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c | |||
@@ -1326,8 +1326,7 @@ static void rbd_notify_cb(u64 ver, u64 notify_id, u8 opcode, void *data) | |||
1326 | /* | 1326 | /* |
1327 | * Request sync osd notify | 1327 | * Request sync osd notify |
1328 | */ | 1328 | */ |
1329 | static int rbd_req_sync_notify(struct rbd_device *rbd_dev, | 1329 | static int rbd_req_sync_notify(struct rbd_device *rbd_dev) |
1330 | const char *object_name) | ||
1331 | { | 1330 | { |
1332 | struct ceph_osd_req_op *ops; | 1331 | struct ceph_osd_req_op *ops; |
1333 | struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; | 1332 | struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; |
@@ -1358,7 +1357,8 @@ static int rbd_req_sync_notify(struct rbd_device *rbd_dev, | |||
1358 | 0, | 1357 | 0, |
1359 | CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, | 1358 | CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, |
1360 | ops, | 1359 | ops, |
1361 | object_name, 0, 0, NULL, NULL, NULL); | 1360 | rbd_dev->header_name, |
1361 | 0, 0, NULL, NULL, NULL); | ||
1362 | if (ret < 0) | 1362 | if (ret < 0) |
1363 | goto fail_event; | 1363 | goto fail_event; |
1364 | 1364 | ||
@@ -2651,7 +2651,7 @@ static ssize_t rbd_snap_add(struct device *dev, | |||
2651 | mutex_unlock(&ctl_mutex); | 2651 | mutex_unlock(&ctl_mutex); |
2652 | 2652 | ||
2653 | /* make a best effort, don't error if failed */ | 2653 | /* make a best effort, don't error if failed */ |
2654 | rbd_req_sync_notify(rbd_dev, rbd_dev->header_name); | 2654 | rbd_req_sync_notify(rbd_dev); |
2655 | 2655 | ||
2656 | ret = count; | 2656 | ret = count; |
2657 | kfree(name); | 2657 | kfree(name); |