From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Mick Subject: Re: [PATCH 1/3] rbd: small changes Date: Tue, 22 Jan 2013 14:40:12 -0800 Message-ID: <50FF154C.1010002@inktank.com> References: <50FF0B22.5060201@inktank.com> <50FF0B66.20805@inktank.com> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Return-path: Received: from mail-pa0-f52.google.com ([209.85.220.52]:63587 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753097Ab3AVWkQ (ORCPT ); Tue, 22 Jan 2013 17:40:16 -0500 Received: by mail-pa0-f52.google.com with SMTP id fb1so4317035pad.25 for ; Tue, 22 Jan 2013 14:40:15 -0800 (PST) In-Reply-To: <50FF0B66.20805@inktank.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Alex Elder Cc: ceph-devel Reviewed-by: Dan Mick On 01/22/2013 01:57 PM, Alex Elder wrote: > A few very minor changes to the rbd code: > - RBD_MAX_OPT_LEN is unused, so get rid of it > - Consolidate rbd options definitions > - Make rbd_segment_name() return pointer to const char > > Signed-off-by: Alex Elder > --- > drivers/block/rbd.c | 17 ++++++++--------- > 1 file changed, 8 insertions(+), 9 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 007b726..4ed0741 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -69,7 +69,6 @@ > (NAME_MAX - (sizeof (RBD_SNAP_DEV_NAME_PREFIX) - 1)) > > #define RBD_MAX_SNAP_COUNT 510 /* allows max snapc to fit in 4KB */ > -#define RBD_MAX_OPT_LEN 1024 > > #define RBD_SNAP_HEAD_NAME "-" > > @@ -96,8 +95,6 @@ > #define DEV_NAME_LEN 32 > #define MAX_INT_FORMAT_WIDTH ((5 * sizeof (int)) / 2 + 1) > > -#define RBD_READ_ONLY_DEFAULT false > - > /* > * block device image metadata (in-memory version) > */ > @@ -156,10 +153,6 @@ struct rbd_spec { > struct kref kref; > }; > > -struct rbd_options { > - bool read_only; > -}; > - > /* > * an instance of the client. multiple devices may share an rbd client. > */ > @@ -475,6 +468,12 @@ static match_table_t rbd_opts_tokens = { > {-1, NULL} > }; > > +struct rbd_options { > + bool read_only; > +}; > + > +#define RBD_READ_ONLY_DEFAULT false > + > static int parse_rbd_opts_token(char *c, void *private) > { > struct rbd_options *rbd_opts = private; > @@ -773,7 +772,7 @@ static void rbd_header_free(struct rbd_image_header > *header) > header->snapc = NULL; > } > > -static char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) > +static const char *rbd_segment_name(struct rbd_device *rbd_dev, u64 offset) > { > char *name; > u64 segment; > @@ -1338,7 +1337,7 @@ static int rbd_do_op(struct request *rq, > struct rbd_req_coll *coll, > int coll_index) > { > - char *seg_name; > + const char *seg_name; > u64 seg_ofs; > u64 seg_len; > int ret; >