lk/linux-kernel-test
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

rbd: drop "object_name" from rbd_req_sync_notify()

Browse Source 
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>
This commit is contained in:
Alex Elder
2012-07-25 09:32:40 -05:00
committed by Sage Weil
parent 0e6f322d55
commit 4cb162508a
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
drivers/block/rbd.c
View File

@@ -1326,8 +1326,7 @@ static void rbd_notify_cb(u64 ver, u64 notify_id, u8 opcode, void *data)
/* /*
* Request sync osd notify * Request sync osd notify
*/ */
static int rbd_req_sync_notify(struct rbd_device *rbd_dev, static int rbd_req_sync_notify(struct rbd_device *rbd_dev)
const char *object_name)
{ {
struct ceph_osd_req_op *ops; struct ceph_osd_req_op *ops;
struct ceph_osd_client *osdc = &rbd_dev->rbd_client->client->osdc; 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, 0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK, CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops, ops,
object_name, 0, 0, NULL, NULL, NULL); rbd_dev->header_name,
0, 0, NULL, NULL, NULL);
if (ret < 0) if (ret < 0)
goto fail_event; goto fail_event;
@@ -2651,7 +2651,7 @@ static ssize_t rbd_snap_add(struct device *dev,
mutex_unlock(&ctl_mutex); mutex_unlock(&ctl_mutex);
/* make a best effort, don't error if failed */ /* 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; ret = count;
kfree(name); kfree(name);