From patchwork Wed Oct 31 01:49:14 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Alex Elder X-Patchwork-Id: 1675341 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 99ED83FD8C for ; Wed, 31 Oct 2012 01:49:18 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932338Ab2JaBtS (ORCPT ); Tue, 30 Oct 2012 21:49:18 -0400 Received: from mail-ia0-f174.google.com ([209.85.210.174]:50952 "EHLO mail-ia0-f174.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S932069Ab2JaBtR (ORCPT ); Tue, 30 Oct 2012 21:49:17 -0400 Received: by mail-ia0-f174.google.com with SMTP id y32so677182iag.19 for ; Tue, 30 Oct 2012 18:49:17 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=message-id:date:from:user-agent:mime-version:to:subject:references :in-reply-to:content-type:content-transfer-encoding :x-gm-message-state; bh=gmwZ1uiPzcO8jMJTzTZIXTHUi37p44wSZ3hbLuE0XMs=; b=b3YygRcm3HuK1iGSxt2HWLDYmr+PJjO/mHwgfmBMEdUg2pYJ5EnhedZt74MU3Helik Ofg6bAMzyVvI+dzLfUoSoY4P/08Gty6l80338a2u4hdmFrqFINndWsNb2Fdmu8K/zRTN mW1EoC0nn1j23Gy5QVLMASrKo0V3OSxy/z/Rki0EWpEhQjjKpd9JGoxlbNazMUGslHqd wmpTI/AocH4+X8I1VZrH6dyr4Hu5UPguOZxKk7C3OeKM9MEPMNdDxgmwTUPddgoJvYFC p92Iuk1uXz4xgjwpAhjChuiePrW+PUTECANIUyDq+pNaPomHgNOBVEejNdM6ffFohx0X jLRg== Received: by 10.50.0.193 with SMTP id 1mr77923igg.0.1351648157250; Tue, 30 Oct 2012 18:49:17 -0700 (PDT) Received: from [172.22.22.4] (c-24-118-242-216.hsd1.mn.comcast.net. [24.118.242.216]) by mx.google.com with ESMTPS id ex10sm2025091igc.15.2012.10.30.18.49.15 (version=SSLv3 cipher=OTHER); Tue, 30 Oct 2012 18:49:16 -0700 (PDT) Message-ID: <5090839A.9060401@inktank.com> Date: Tue, 30 Oct 2012 20:49:14 -0500 From: Alex Elder User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:16.0) Gecko/20121028 Thunderbird/16.0.2 MIME-Version: 1.0 To: ceph-devel Subject: [PATCH 2/6] rbd: allow null image name References: <509081C4.3050402@inktank.com> In-Reply-To: <509081C4.3050402@inktank.com> X-Gm-Message-State: ALoCoQnBADbeuEAGxE0oowEp4b96HBWi/Mvd9kW5Y1wXiTNuR0BNIiZYtcOFTJTzOTghPaY85HH+ Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org Format 2 parent images are partially identified by their image id, but it may not be possible to determine their image name. The name is not strictly needed for correct operation, so we won't be treating it as an error if we don't know it. Handle this case gracefully in rbd_name_show(). Signed-off-by: Alex Elder Reviewed-by: Josh Durgin --- drivers/block/rbd.c | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index a852133..28052ff 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -1982,7 +1982,10 @@ static ssize_t rbd_name_show(struct device *dev, { struct rbd_device *rbd_dev = dev_to_rbd_dev(dev); - return sprintf(buf, "%s\n", rbd_dev->spec->image_name); + if (rbd_dev->spec->image_name) + return sprintf(buf, "%s\n", rbd_dev->spec->image_name); + + return sprintf(buf, "(unknown)\n"); } static ssize_t rbd_image_id_show(struct device *dev,