CEPH filesystem development
 help / color / mirror / Atom feed
From: Alex Elder <elder@inktank.com>
To: ceph-devel@vger.kernel.org
Subject: [PATCH 5/7] rbd: drop "object_name" from rbd_req_sync_notify()
Date: Thu, 26 Jul 2012 13:57:39 -0500	[thread overview]
Message-ID: <50119323.7080001@inktank.com> (raw)
In-Reply-To: <50119076.1030307@inktank.com>

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>
---
 drivers/block/rbd.c |    8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 5cfeeaf..b9aa377 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1323,8 +1323,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;
@@ -1355,7 +1354,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;

@@ -2647,7 +2647,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);
-- 
1.7.9.5


  parent reply	other threads:[~2012-07-26 18:57 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2012-07-26 18:46 [PATCH 0/7] rbd: drop unused parameters from functions Alex Elder
2012-07-26 18:57 ` [PATCH 1/7] rbd: snapc is unused in rbd_req_sync_read() Alex Elder
2012-07-26 18:57 ` [PATCH 2/7] rbd: drop rbd_header_from_disk() gfp_flags parameter Alex Elder
2012-07-26 18:57 ` [PATCH 3/7] rbd: drop rbd_dev parameter in snap functions Alex Elder
2012-07-26 18:57 ` [PATCH 4/7] rbd: drop "object_name" from rbd_req_sync_watch() Alex Elder
2012-07-26 18:57 ` Alex Elder [this message]
2012-07-26 18:57 ` [PATCH 6/7] rbd: drop "object_name" from rbd_req_sync_notify_ack() Alex Elder
2012-07-26 18:57 ` [PATCH 7/7] rbd: drop "object_name" from rbd_req_sync_unwatch() Alex Elder
2012-07-26 19:35 ` [PATCH 0/7] rbd: drop unused parameters from functions Josh Durgin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=50119323.7080001@inktank.com \
    --to=elder@inktank.com \
    --cc=ceph-devel@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox