diff options
| author | Alex Elder <elder@inktank.com> | 2012-07-25 09:32:40 -0500 |
|---|---|---|
| committer | Sage Weil <sage@inktank.com> | 2012-07-30 18:15:53 -0700 |
| commit | 4cb162508afade6d24d58e30be2bbaed80cf84d5 (patch) | |
| tree | 3ab51bcb873c99457bc035214c7a50e1b25de96e /drivers/block | |
| parent | 0e6f322d550a104b2065288c9f6426d5c0414b76 (diff) | |
| download | linux-3.10-4cb162508afade6d24d58e30be2bbaed80cf84d5.tar.gz linux-3.10-4cb162508afade6d24d58e30be2bbaed80cf84d5.tar.bz2 linux-3.10-4cb162508afade6d24d58e30be2bbaed80cf84d5.zip | |
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 b8e557fbf73..d187d087a50 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) /* * Request sync osd notify */ -static int rbd_req_sync_notify(struct rbd_device *rbd_dev, - const char *object_name) +static int rbd_req_sync_notify(struct rbd_device *rbd_dev) { struct ceph_osd_req_op *ops; 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, 0, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, ops, - object_name, 0, 0, NULL, NULL, NULL); + rbd_dev->header_name, + 0, 0, NULL, NULL, NULL); if (ret < 0) goto fail_event; @@ -2651,7 +2651,7 @@ static ssize_t rbd_snap_add(struct device *dev, mutex_unlock(&ctl_mutex); /* make a best effort, don't error if failed */ - rbd_req_sync_notify(rbd_dev, rbd_dev->header_name); + rbd_req_sync_notify(rbd_dev); ret = count; kfree(name); |