From: Alex Elder <elder@inktank.com>
To: ceph-devel@vger.kernel.org
Subject: [PATCH 08/12] rbd: drop rbd_req_sync_exec() "ver" parameter
Date: Thu, 19 Jul 2012 16:08:48 -0500 [thread overview]
Message-ID: <50087760.5070204@inktank.com> (raw)
In-Reply-To: <500874F5.4090205@inktank.com>
The only place that passes a version pointer to rbd_req_sync_exec()
is in rbd_header_add_snap(), and that spot ignores the result.
The only thing rbd_req_sync_exec() does with its "ver" parameter is
pass it directly to rbd_req_sync_op(). So we can just use a null
pointer there, and drop the "ver" parameter to rbd_req_sync_exec().
Signed-off-by: Alex Elder <elder@inktank.com>
---
drivers/block/rbd.c | 8 +++-----
1 files changed, 3 insertions(+), 5 deletions(-)
diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
index 955d75d..d4a8d9e 100644
--- a/drivers/block/rbd.c
+++ b/drivers/block/rbd.c
@@ -1374,8 +1374,7 @@ static int rbd_req_sync_exec(struct rbd_device
*rbd_dev,
const char *class_name,
const char *method_name,
const char *data,
- int len,
- u64 *ver)
+ int len)
{
struct ceph_osd_req_op *ops;
int class_name_len = strlen(class_name);
@@ -1398,7 +1397,7 @@ static int rbd_req_sync_exec(struct rbd_device
*rbd_dev,
0,
CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
ops,
- object_name, 0, 0, NULL, NULL, ver);
+ object_name, 0, 0, NULL, NULL, NULL);
rbd_destroy_ops(ops);
@@ -1651,7 +1650,6 @@ static int rbd_header_add_snap(struct rbd_device
*rbd_dev,
u64 new_snapid;
int ret;
void *data, *p, *e;
- u64 ver;
struct ceph_mon_client *monc;
/* we should create a snapshot only if we're pointing at the head */
@@ -1676,7 +1674,7 @@ static int rbd_header_add_snap(struct rbd_device
*rbd_dev,
ret = rbd_req_sync_exec(rbd_dev, rbd_dev->header_name,
"rbd", "snap_add",
- data, p - data, &ver);
+ data, p - data);
kfree(data);
--
1.7.5.4
next prev parent reply other threads:[~2012-07-19 21:08 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-19 20:58 [PATCH 00/12] rbd: cleanup series Alex Elder
2012-07-19 21:08 ` [PATCH 01/12] rbd: drop extra header_rwsem init Alex Elder
2012-07-19 21:08 ` [PATCH 02/12] rbd: simplify __rbd_remove_all_snaps() Alex Elder
2012-07-19 21:08 ` [PATCH 03/12] rbd: clean up a few dout() calls Alex Elder
2012-07-19 21:08 ` [PATCH 04/12] ceph: define snap counts as u32 everywhere Alex Elder
2012-07-19 21:08 ` [PATCH 05/12] rbd: snapc is unused in rbd_req_sync_read() Alex Elder
2012-07-19 21:08 ` [PATCH 06/12] rbd: drop rbd_header_from_disk() gfp_flags parameter Alex Elder
2012-07-19 21:08 ` [PATCH 07/12] rbd: drop rbd_dev parameter in snap functions Alex Elder
2012-07-19 21:08 ` Alex Elder [this message]
2012-07-19 21:08 ` [PATCH 09/12] rbd: have __rbd_add_snap_dev() return a pointer Alex Elder
2012-07-19 21:08 ` [PATCH 10/12] rbd: make rbd_create_rw_ops() " Alex Elder
2012-07-19 21:09 ` [PATCH 11/12] rbd: always pass ops array to rbd_req_sync_op() Alex Elder
2012-07-19 21:09 ` [PATCH 12/12] rbd: fixes in rbd_header_from_disk() Alex Elder
2012-07-26 18:22 ` [PATCH 00/12] rbd: cleanup series Alex Elder
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=50087760.5070204@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