From patchwork Thu Jan 3 19:11:55 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1929211 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 119423FE37 for ; Thu, 3 Jan 2013 19:11:59 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753830Ab3ACTL6 (ORCPT ); Thu, 3 Jan 2013 14:11:58 -0500 Received: from mail-ie0-f176.google.com ([209.85.223.176]:34034 "EHLO mail-ie0-f176.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753838Ab3ACTL5 (ORCPT ); Thu, 3 Jan 2013 14:11:57 -0500 Received: by mail-ie0-f176.google.com with SMTP id 13so18453889iea.7 for ; Thu, 03 Jan 2013 11:11:57 -0800 (PST) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=x-received:message-id:date:from:user-agent:mime-version:to:subject :references:in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=YPIL70vk3h1DnDXKGDCKfZgLHrwRa1lpTOMBZaixpIo=; b=O3yAiQ/TDaVzmUJzSeiMsB9OZ9798DaaAuPXtcNYf1L2RFh3Ab6N4PH5meGV+hoKf2 6fn4DBbNjnUbiI+jD+hMUU9dL63uX3J6Qr5e5a5Pu4DpWIDRuHET+LZYN/M9DQXXt9ho ihSQjcMbVuI/aEc2sjvMPIRECddaqr/QEJ5OETFefDGNsW6RNWOKjr1h1LkY0wbFUaPi vnCR2FMbLWk34ciUMMRPxNA09i/Ibe145fZgkVP+6Wmggord+6yQDFcVcHYc1rVp/eZe 7lE13/uzrPQ9GCzzCneb101iv53vnV2ChuzywaB5S08ECZZma6+cYD/6bek+UooK55cb ONng== X-Received: by 10.50.151.166 with SMTP id ur6mr43795314igb.66.1357240317567; Thu, 03 Jan 2013 11:11:57 -0800 (PST) Received: from [172.22.22.4] (c-71-195-31-37.hsd1.mn.comcast.net. [71.195.31.37]) by mx.google.com with ESMTPS id eo7sm41770976igc.12.2013.01.03.11.11.55 (version=SSLv3 cipher=OTHER); Thu, 03 Jan 2013 11:11:56 -0800 (PST) Message-ID: <50E5D7FB.9040906@inktank.com> Date: Thu, 03 Jan 2013 13:11:55 -0600 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:17.0) Gecko/17.0 Thunderbird/17.0 MIME-Version: 1.0 To: "ceph-devel@vger.kernel.org" Subject: [PATCH REPOST 2/4] rbd: add warning messages for missing arguments References: <50E5D7A9.6040101@inktank.com> In-Reply-To: <50E5D7A9.6040101@inktank.com> X-Gm-Message-State: ALoCoQlnTtSJL61wRIBSLu4i4G3rNPqw9rihHm7pQRecXmQvywSAdYRotQFXfqTM07MjciHvZXC0 Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org 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 "-"