From: Josh Durgin <josh.durgin@inktank.com>
To: Alex Elder <elder@inktank.com>
Cc: ceph-devel@vger.kernel.org
Subject: Re: [PATCH 16/16] rbd: kill num_reply parameters
Date: Wed, 11 Jul 2012 14:07:54 -0700 [thread overview]
Message-ID: <4FFDEB2A.9040800@inktank.com> (raw)
In-Reply-To: <4FFD87A0.4000602@inktank.com>
Reviewed-by: Josh Durgin <josh.durgin@inktank.com>
On 07/11/2012 07:03 AM, Alex Elder wrote:
> Several functions include a num_reply parameter, but it is never
> used. Just get rid of it everywhere--it seems to be something
> that never got fully implemented.
>
> Signed-off-by: Alex Elder<elder@inktank.com>
> ---
> drivers/block/rbd.c | 19 ++++++-------------
> 1 files changed, 6 insertions(+), 13 deletions(-)
>
> diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c
> index c99ea08..c023be5 100644
> --- a/drivers/block/rbd.c
> +++ b/drivers/block/rbd.c
> @@ -863,7 +863,6 @@ static int rbd_do_request(struct request *rq,
> int num_pages,
> int flags,
> struct ceph_osd_req_op *ops,
> - int num_reply,
> struct rbd_req_coll *coll,
> int coll_index,
> void (*rbd_cb)(struct ceph_osd_request *req,
> @@ -1019,7 +1018,6 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev,
> int opcode,
> int flags,
> struct ceph_osd_req_op *orig_ops,
> - int num_reply,
> const char *object_name,
> u64 ofs, u64 len,
> char *buf,
> @@ -1055,7 +1053,6 @@ static int rbd_req_sync_op(struct rbd_device *rbd_dev,
> pages, num_pages,
> flags,
> ops,
> - 2,
> NULL, 0,
> NULL,
> linger_req, ver);
> @@ -1080,7 +1077,7 @@ static int rbd_do_op(struct request *rq,
> struct rbd_device *rbd_dev,
> struct ceph_snap_context *snapc,
> u64 snapid,
> - int opcode, int flags, int num_reply,
> + int opcode, int flags,
> u64 ofs, u64 len,
> struct bio *bio,
> struct rbd_req_coll *coll,
> @@ -1119,7 +1116,6 @@ static int rbd_do_op(struct request *rq,
> NULL, 0,
> flags,
> ops,
> - num_reply,
> coll, coll_index,
> rbd_req_cb, 0, NULL);
>
> @@ -1143,7 +1139,6 @@ static int rbd_req_write(struct request *rq,
> return rbd_do_op(rq, rbd_dev, snapc, CEPH_NOSNAP,
> CEPH_OSD_OP_WRITE,
> CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
> - 2,
> ofs, len, bio, coll, coll_index);
> }
>
> @@ -1162,7 +1157,6 @@ static int rbd_req_read(struct request *rq,
> snapid,
> CEPH_OSD_OP_READ,
> CEPH_OSD_FLAG_READ,
> - 2,
> ofs, len, bio, coll, coll_index);
> }
>
> @@ -1182,7 +1176,7 @@ static int rbd_req_sync_read(struct rbd_device
> *rbd_dev,
> CEPH_OSD_OP_READ,
> CEPH_OSD_FLAG_READ,
> NULL,
> - 1, object_name, ofs, len, buf, NULL, ver);
> + object_name, ofs, len, buf, NULL, ver);
> }
>
> /*
> @@ -1209,7 +1203,6 @@ static int rbd_req_sync_notify_ack(struct
> rbd_device *rbd_dev,
> NULL, 0,
> CEPH_OSD_FLAG_READ,
> ops,
> - 1,
> NULL, 0,
> rbd_simple_req_cb, 0, NULL);
>
> @@ -1265,7 +1258,7 @@ static int rbd_req_sync_watch(struct rbd_device
> *rbd_dev,
> 0,
> CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
> ops,
> - 1, object_name, 0, 0, NULL,
> + object_name, 0, 0, NULL,
> &rbd_dev->watch_request, NULL);
>
> if (ret< 0)
> @@ -1303,7 +1296,7 @@ static int rbd_req_sync_unwatch(struct rbd_device
> *rbd_dev,
> 0,
> CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
> ops,
> - 1, object_name, 0, 0, NULL, NULL, NULL);
> + object_name, 0, 0, NULL, NULL, NULL);
>
> rbd_destroy_ops(ops);
> ceph_osdc_cancel_event(rbd_dev->watch_event);
> @@ -1361,7 +1354,7 @@ static int rbd_req_sync_notify(struct rbd_device
> *rbd_dev,
> 0,
> CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
> ops,
> - 1, object_name, 0, 0, NULL, NULL, NULL);
> + object_name, 0, 0, NULL, NULL, NULL);
> if (ret< 0)
> goto fail_event;
>
> @@ -1409,7 +1402,7 @@ static int rbd_req_sync_exec(struct rbd_device
> *rbd_dev,
> 0,
> CEPH_OSD_FLAG_WRITE | CEPH_OSD_FLAG_ONDISK,
> ops,
> - 1, object_name, 0, 0, NULL, NULL, ver);
> + object_name, 0, 0, NULL, NULL, ver);
>
> rbd_destroy_ops(ops);
>
prev parent reply other threads:[~2012-07-11 21:07 UTC|newest]
Thread overview: 69+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-07-11 13:49 [PATCH 00/16] rbd: updates and enhancements Alex Elder
2012-07-11 14:00 ` [PATCH 01/16] libceph: fix off-by-one bug in ceph_encode_filepath() Alex Elder
2012-07-11 16:59 ` Yehuda Sadeh
2012-07-11 18:35 ` Josh Durgin
2012-07-11 14:00 ` [PATCH 02/16] rbd: drop a useless local variable Alex Elder
2012-07-11 16:58 ` Yehuda Sadeh Weinraub
2012-07-11 18:36 ` Josh Durgin
2012-07-11 14:00 ` [PATCH 03/16] libceph: define ceph_decode_string() Alex Elder
2012-07-11 17:13 ` Yehuda Sadeh
2012-07-11 18:43 ` Josh Durgin
2012-07-11 22:09 ` [PATCH v2 " Alex Elder
2012-07-12 17:13 ` Alex Elder
2012-07-11 14:01 ` [PATCH 04/16] libceph: define ceph_extract_encoded_string() Alex Elder
2012-07-11 17:20 ` Yehuda Sadeh
2012-07-11 17:45 ` Sage Weil
2012-07-11 19:14 ` Alex Elder
2012-07-11 19:26 ` Yehuda Sadeh
2012-07-11 22:10 ` [PATCH v2 " Alex Elder
2012-07-12 17:13 ` [PATCH v3 " Alex Elder
2012-07-12 18:20 ` Sage Weil
2012-07-12 19:48 ` Alex Elder
2012-07-12 22:47 ` Alex Elder
2012-07-12 22:47 ` [PATCH v4 " Alex Elder
2012-07-11 14:01 ` [PATCH 05/16] rbd: define dup_token() Alex Elder
2012-07-11 17:48 ` Yehuda Sadeh
2012-07-11 21:50 ` Alex Elder
2012-07-11 18:50 ` Josh Durgin
2012-07-11 14:01 ` [PATCH 06/16] rbd: rename rbd_dev->block_name Alex Elder
2012-07-11 17:55 ` Yehuda Sadeh
2012-07-11 19:02 ` Josh Durgin
2012-07-11 22:13 ` Alex Elder
2012-07-11 14:01 ` [PATCH 07/16] rbd: dynamically allocate object prefix Alex Elder
2012-07-11 19:12 ` Josh Durgin
2012-07-11 19:17 ` Alex Elder
2012-07-12 17:24 ` [PATCH v2 " Alex Elder
2012-07-12 17:42 ` Josh Durgin
2012-07-11 14:02 ` [PATCH 08/16] rbd: don't store pool name in struct rbd_dev Alex Elder
2012-07-11 19:36 ` Josh Durgin
2012-07-11 20:19 ` Sage Weil
2012-07-11 22:25 ` Alex Elder
2012-07-11 23:32 ` Josh Durgin
2012-07-12 2:59 ` Alex Elder
2012-07-12 4:19 ` Josh Durgin
2012-07-12 17:05 ` Alex Elder
2012-07-12 17:05 ` [PATCH] rbd: create pool_id device attribute Alex Elder
2012-07-12 17:16 ` Josh Durgin
2012-07-12 17:35 ` Alex Elder
2012-07-12 17:05 ` [PATCH] rbd: dynamically allocate pool name Alex Elder
2012-07-12 17:21 ` Josh Durgin
2012-07-11 14:02 ` [PATCH 09/16] rbd: dynamically allocate image header name Alex Elder
2012-07-11 20:41 ` Josh Durgin
2012-07-11 14:02 ` [PATCH 10/16] rbd: dynamically allocate image name Alex Elder
2012-07-11 20:49 ` Josh Durgin
2012-07-11 20:52 ` Josh Durgin
2012-07-12 11:12 ` Alex Elder
2012-07-11 14:02 ` [PATCH 11/16] rbd: dynamically allocate snapshot name Alex Elder
2012-07-11 20:53 ` Josh Durgin
2012-07-11 14:02 ` [PATCH 12/16] rbd: use rbd_dev consistently Alex Elder
2012-07-11 20:56 ` Josh Durgin
2012-07-11 14:02 ` [PATCH 13/16] rbd: rename some fields in struct rbd_dev Alex Elder
2012-07-11 21:01 ` Josh Durgin
2012-07-12 11:14 ` Alex Elder
2012-07-11 14:02 ` [PATCH 14/16] rbd: more symbol renames Alex Elder
2012-07-11 21:03 ` Josh Durgin
2012-07-12 11:15 ` Alex Elder
2012-07-11 14:03 ` [PATCH 15/16] rbd: option " Alex Elder
2012-07-11 21:07 ` Josh Durgin
2012-07-11 14:03 ` [PATCH 16/16] rbd: kill num_reply parameters Alex Elder
2012-07-11 21:07 ` Josh Durgin [this message]
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=4FFDEB2A.9040800@inktank.com \
--to=josh.durgin@inktank.com \
--cc=ceph-devel@vger.kernel.org \
--cc=elder@inktank.com \
/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