From mboxrd@z Thu Jan 1 00:00:00 1970 From: Dan Mick Subject: Re: [PATCH REPOST 2/4] rbd: add warning messages for missing arguments Date: Thu, 03 Jan 2013 17:10:40 -0800 Message-ID: <50E62C10.1010608@inktank.com> References: <50E5D7A9.6040101@inktank.com> <50E5D7FB.9040906@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-da0-f54.google.com ([209.85.210.54]:48565 "EHLO mail-da0-f54.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753901Ab3ADBKo (ORCPT ); Thu, 3 Jan 2013 20:10:44 -0500 Received: by mail-da0-f54.google.com with SMTP id n2so7285410dad.41 for ; Thu, 03 Jan 2013 17:10:43 -0800 (PST) In-Reply-To: <50E5D7FB.9040906@inktank.com> Sender: ceph-devel-owner@vger.kernel.org List-ID: To: Alex Elder Cc: "ceph-devel@vger.kernel.org" Do you want to include in the message some kind of indication which operation/function is involved? (this is definitely better, but even better might be to add "rbd add" or "rbd_add_parse_args" to the msgs) On 01/03/2013 11:11 AM, Alex Elder wrote: > Tell the user (via dmesg) what was wrong with the arguments provided > via /sys/bus/rbd/add. > > Signed-off-by: Alex Elder > --- > drivers/block/rbd.c | 24 ++++++++++++++++-------- > 1 file changed, 16 insertions(+), 8 deletions(-) > > diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c > index 635b81d..31da8c5 100644 > --- a/drivers/block/rbd.c > +++ b/drivers/block/rbd.c > @@ -3244,8 +3244,10 @@ static int rbd_add_parse_args(const char *buf, > /* The first four tokens are required */ > > len = next_token(&buf); > - if (!len) > - return -EINVAL; /* Missing monitor address(es) */ > + if (!len) { > + rbd_warn(NULL, "no monitor address(es) provided"); > + return -EINVAL; > + } > mon_addrs = buf; > mon_addrs_size = len + 1; > buf += len; > @@ -3254,8 +3256,10 @@ static int rbd_add_parse_args(const char *buf, > options = dup_token(&buf, NULL); > if (!options) > return -ENOMEM; > - if (!*options) > - goto out_err; /* Missing options */ > + if (!*options) { > + rbd_warn(NULL, "no options provided"); > + goto out_err; > + } > > spec = rbd_spec_alloc(); > if (!spec) > @@ -3264,14 +3268,18 @@ static int rbd_add_parse_args(const char *buf, > spec->pool_name = dup_token(&buf, NULL); > if (!spec->pool_name) > goto out_mem; > - if (!*spec->pool_name) > - goto out_err; /* Missing pool name */ > + if (!*spec->pool_name) { > + rbd_warn(NULL, "no pool name provided"); > + goto out_err; > + } > > spec->image_name = dup_token(&buf, NULL); > if (!spec->image_name) > goto out_mem; > - if (!*spec->image_name) > - goto out_err; /* Missing image name */ > + if (!*spec->image_name) { > + rbd_warn(NULL, "no image name provided"); > + goto out_err; > + } > > /* > * Snapshot name is optional; default is to use "-" >