From patchwork Thu Jul 24 08:42:44 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 4615031 Return-Path: X-Original-To: patchwork-ceph-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3F0F09F295 for ; Thu, 24 Jul 2014 08:43:12 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 803EE2017D for ; Thu, 24 Jul 2014 08:43:11 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id AA49720160 for ; Thu, 24 Jul 2014 08:43:10 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S934455AbaGXInF (ORCPT ); Thu, 24 Jul 2014 04:43:05 -0400 Received: from mail-la0-f44.google.com ([209.85.215.44]:58734 "EHLO mail-la0-f44.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934448AbaGXInE (ORCPT ); Thu, 24 Jul 2014 04:43:04 -0400 Received: by mail-la0-f44.google.com with SMTP id e16so1683127lan.3 for ; Thu, 24 Jul 2014 01:43:01 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:subject:date:message-id:in-reply-to :references; bh=qJkOe8ShTbBPFjnl1dsLM0uLisrjqjjYrKAczsjJicc=; b=AGgq7AW5viNJgZmruZPy/EF44saRvD+ua9J/ISQJ06pNeICuan6DjWrwLIfhk1mm4i TUJd/phwqiO7Pt/xgN2G5PQwwnvvV937ffBzL7wsBEKDCkxUPK3eaAV3EQJKZrkxr4PQ OONmZ6kBeOo+4/idsOMJP2Q48KApY8BShIUBsGMOVlTc2ariOlHPt7rZicrJToTFjkW4 p7SJeH8MjolcPWrUvm4iphq1PVlfuIwIbNX9qXRy09KvmOu71cc/eMVV9n1b4w0DUrI9 P/EtGruEMgg/4eDPdnJqBTKY6WSEyJ0B0q47Y+SZdDgLti7EzjXRaI1bEFZz1J7aOnIg iXtw== X-Gm-Message-State: ALoCoQmClpI4GbbHNtsjIIBDsKQQQFwvXkGpAzwxu2PQTAzDzpKN7HGr/b2SaqNfcRrGYGorzmfE X-Received: by 10.112.74.200 with SMTP id w8mr7186812lbv.79.1406191381559; Thu, 24 Jul 2014 01:43:01 -0700 (PDT) Received: from localhost ([109.110.66.237]) by mx.google.com with ESMTPSA id a7sm3874256lae.37.2014.07.24.01.43.00 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 01:43:00 -0700 (PDT) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Subject: [PATCH 3/8] rbd: remove unnecessary asserts in rbd_dev_image_probe() Date: Thu, 24 Jul 2014 12:42:44 +0400 Message-Id: <1406191369-6746-4-git-send-email-ilya.dryomov@inktank.com> X-Mailer: git-send-email 1.7.10.4 In-Reply-To: <1406191369-6746-1-git-send-email-ilya.dryomov@inktank.com> References: <1406191369-6746-1-git-send-email-ilya.dryomov@inktank.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Spam-Status: No, score=-6.9 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=ham version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP spec->image_id assert doesn't buy us much and image_format is asserted in rbd_dev_header_name() and rbd_dev_header_info() anyway. Signed-off-by: Ilya Dryomov Reviewed-by: Alex Elder --- drivers/block/rbd.c | 2 -- 1 file changed, 2 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 0d3be608f16f..4541f6027e4a 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -5143,8 +5143,6 @@ static int rbd_dev_image_probe(struct rbd_device *rbd_dev, bool mapping) ret = rbd_dev_image_id(rbd_dev); if (ret) return ret; - rbd_assert(rbd_dev->spec->image_id); - rbd_assert(rbd_image_format_valid(rbd_dev->image_format)); ret = rbd_dev_header_name(rbd_dev); if (ret)