From patchwork Tue Feb 14 20:11:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Ilya Dryomov X-Patchwork-Id: 9572767 Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id 5FF9960578 for ; Tue, 14 Feb 2017 20:12:38 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 5BBF9281E1 for ; Tue, 14 Feb 2017 20:12:38 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 50AFC28417; Tue, 14 Feb 2017 20:12:38 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.3 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, FREEMAIL_FROM, RCVD_IN_DNSWL_HI, RCVD_IN_SORBS_SPAM, T_DKIM_INVALID autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id EF0E0281E1 for ; Tue, 14 Feb 2017 20:12:37 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754934AbdBNUMg (ORCPT ); Tue, 14 Feb 2017 15:12:36 -0500 Received: from mail-qk0-f195.google.com ([209.85.220.195]:36133 "EHLO mail-qk0-f195.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754730AbdBNUMc (ORCPT ); Tue, 14 Feb 2017 15:12:32 -0500 Received: by mail-qk0-f195.google.com with SMTP id p22so12928996qka.3 for ; Tue, 14 Feb 2017 12:12:31 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=YKkMTr07qbREcS5Nm3847lpcBbESjf6OP/mZXPGMf7I=; b=CrlyUlNDoJ/NXUSAMdJFrBEk/f6uqHnXY5Betnsgllv4DFuSWbJUWZpgP0aquB4KYg 7M/bOcOlL74q7Lmh9AcA+QJU1P9PC0wgBcZKjMFn02m4rJFbBP45ehdtIp9zax29h0Z4 /UZaUoR66KtXVSByGib2qmtrv99fEfzg5Cfv7C2tDYbzZIIabpjNHUuqdEGFKMjRn1bY Ro1/F8QgpgVjT0sbYn0/TQneQahGBx1sLqT8K6aB82sg6eMpwqhBHvub21+bOhMsmSHO NQkTqHAcDi9pgpH4mVgkeHvpF6bAemBTk06UAF/r71SiehbQFsOH4wYSYQbF4zxoZZIS uqrw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=YKkMTr07qbREcS5Nm3847lpcBbESjf6OP/mZXPGMf7I=; b=tHLlLcjrlXx3izIHmSPs7SrqWe+9VUCjMsygC5ksAMdKj3O/pJqfypNOIKjxDwuA0r RatFn/Y/TgM/wNorYzOx9EaC+1SHkHPmr+YgcfJrLA7WzMnluvz1IYiWYSp1j1+dDuY3 +7FL8G4BzMs6oUS8nG2iY0EvEZxSg0U8OjiFHgCFnZ7TeY4infJux/C3hkAC6BcyYrzH 9EEdEvKTwLVS9YZpx3tYscKGWxjG7uxRddULecyYlUtWeoJN9gijXgJkNg9ZX+AB6hd3 Bf+3/4DbV2e9wlHpv4MrsalfXR060IZBpHIEB/8TVqFnqPK2uhCINkqEzdOLNnwExj/V lt9g== X-Gm-Message-State: AMke39kFnB2i1avvKz6ASymdI0NbKZmbkff3b27vz2VSHv3l/qUJeECDtWPVWEI+fDYs4w== X-Received: by 10.55.178.133 with SMTP id b127mr27933931qkf.170.1487103151057; Tue, 14 Feb 2017 12:12:31 -0800 (PST) Received: from dhcp-1-235.brq.redhat.com (nat-pool-brq-t.redhat.com. [213.175.37.10]) by smtp.gmail.com with ESMTPSA id w138sm939945qka.27.2017.02.14.12.12.30 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 14 Feb 2017 12:12:30 -0800 (PST) From: Ilya Dryomov To: ceph-devel@vger.kernel.org Cc: Alex Elder Subject: [PATCH 02/15] rbd: kill rbd_image_header::{crypt_type,comp_type} Date: Tue, 14 Feb 2017 21:11:51 +0100 Message-Id: <1487103124-2974-3-git-send-email-idryomov@gmail.com> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1487103124-2974-1-git-send-email-idryomov@gmail.com> References: <1487103124-2974-1-git-send-email-idryomov@gmail.com> Sender: ceph-devel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: ceph-devel@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Image format 1 is deprecated and format 2 doesn't have these. Also, __rbd_dev_create() takes care of zeroing (or otherwise initializing) format 2 specific fields. Signed-off-by: Ilya Dryomov --- drivers/block/rbd.c | 9 --------- drivers/block/rbd_types.h | 3 --- 2 files changed, 12 deletions(-) diff --git a/drivers/block/rbd.c b/drivers/block/rbd.c index 76e538c3378e..a6ad714c85ac 100644 --- a/drivers/block/rbd.c +++ b/drivers/block/rbd.c @@ -144,8 +144,6 @@ struct rbd_image_header { /* These six fields never change for a given rbd image */ char *object_prefix; __u8 obj_order; - __u8 crypt_type; - __u8 comp_type; u64 stripe_unit; u64 stripe_count; u64 features; /* Might be changeable someday? */ @@ -1047,12 +1045,6 @@ static int rbd_header_from_disk(struct rbd_device *rbd_dev, if (first_time) { header->object_prefix = object_prefix; header->obj_order = ondisk->options.order; - header->crypt_type = ondisk->options.crypt_type; - header->comp_type = ondisk->options.comp_type; - /* The rest aren't used for format 1 images */ - header->stripe_unit = 0; - header->stripe_count = 0; - header->features = 0; } else { ceph_put_snap_context(header->snapc); kfree(header->snap_names); @@ -5938,7 +5930,6 @@ static int rbd_dev_v2_header_onetime(struct rbd_device *rbd_dev) if (ret < 0) goto out_err; } - /* No support for crypto and compression type format 2 images */ return 0; out_err: diff --git a/drivers/block/rbd_types.h b/drivers/block/rbd_types.h index 94f367db27b0..be9c76d292f5 100644 --- a/drivers/block/rbd_types.h +++ b/drivers/block/rbd_types.h @@ -57,9 +57,6 @@ enum rbd_notify_op { #define RBD_MIN_OBJ_ORDER 16 #define RBD_MAX_OBJ_ORDER 30 -#define RBD_COMP_NONE 0 -#define RBD_CRYPT_NONE 0 - #define RBD_HEADER_TEXT "<<< Rados Block Device Image >>>\n" #define RBD_HEADER_SIGNATURE "RBD" #define RBD_HEADER_VERSION "001.005"