Skip to content

Commit

Permalink
rbd: drop "object_name" from rbd_req_sync_notify()
Browse files Browse the repository at this point in the history
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>
  • Loading branch information
Alex Elder authored and Sage Weil committed Jul 31, 2012
1 parent 0e6f322 commit 4cb1625
Showing 1 changed file with 4 additions and 4 deletions.
8 changes: 4 additions & 4 deletions drivers/block/rbd.c
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down Expand Up @@ -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;

Expand Down Expand Up @@ -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);
Expand Down

0 comments on commit 4cb1625

Please sign in to comment.