From patchwork Mon Jun 29 13:14:00 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sami Tolvanen X-Patchwork-Id: 6689001 X-Patchwork-Delegate: snitzer@redhat.com Return-Path: X-Original-To: patchwork-dm-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id AC797C05AC for ; Mon, 29 Jun 2015 13:18:42 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id CDEBF20547 for ; Mon, 29 Jun 2015 13:18:41 +0000 (UTC) Received: from mx6-phx2.redhat.com (mx6-phx2.redhat.com [209.132.183.39]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D862520544 for ; Mon, 29 Jun 2015 13:18:40 +0000 (UTC) Received: from lists01.pubmisc.prod.ext.phx2.redhat.com (lists01.pubmisc.prod.ext.phx2.redhat.com [10.5.19.33]) by mx6-phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5TDE6r2030458; Mon, 29 Jun 2015 09:14:07 -0400 Received: from int-mx10.intmail.prod.int.phx2.redhat.com (int-mx10.intmail.prod.int.phx2.redhat.com [10.5.11.23]) by lists01.pubmisc.prod.ext.phx2.redhat.com (8.13.8/8.13.8) with ESMTP id t5TDE5wd030249 for ; Mon, 29 Jun 2015 09:14:05 -0400 Received: from mx1.redhat.com (ext-mx04.extmail.prod.ext.phx2.redhat.com [10.5.110.28]) by int-mx10.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id t5TDE53R012300 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-GCM-SHA384 bits=256 verify=NO) for ; Mon, 29 Jun 2015 09:14:05 -0400 Received: from mail-wi0-f182.google.com (mail-wi0-f182.google.com [209.85.212.182]) by mx1.redhat.com (Postfix) with ESMTPS id 5F1652B7841 for ; Mon, 29 Jun 2015 13:14:04 +0000 (UTC) Received: by wiwl6 with SMTP id l6so99442722wiw.0 for ; Mon, 29 Jun 2015 06:14:03 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=20120113; h=date:from:to:subject:message-id:mime-version:content-type :content-disposition:user-agent; bh=MALMJBlN8DizOw6Nc+vEQg9PhytCj2xNjcdHzIt+EQY=; b=Eo/vvTWxPZt9INNyHojAvm0fg5hY1xmeJfzeAWuJl+imw/vHTckPyXSp/GZprskLZt wNq8EUm6RqmVxKSxWnu9/WRBPqyr4U0Ncr+5fELPdDdWkmsq6DI0pwYspbfsIqZ9qNkS CZ07SP1zhqUR1TImF0iyX3SAeCKdYiu7SlpBd1IBHA8XEu2/XrHvzBevl4PBkS+eaqsP ZrqXnWq6ZqcEbyyGK0VIxlmxikFM9Mmq8A9W6SVTHmfHRqSbg9gzuWvu5DrNu8QGnzMn SgPnVyqmxd27H/KjY76jfHObbOSZjqbmbKn+muemhwknZDey+Wdwgcz/7tOH2vgFuCRo 0hjA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:date:from:to:subject:message-id:mime-version :content-type:content-disposition:user-agent; bh=MALMJBlN8DizOw6Nc+vEQg9PhytCj2xNjcdHzIt+EQY=; b=GOGwMzew/eP7a+lg+xcdwCAwchKzmcXCJye19FzaR5CG+aP36NvRCYfVMHCsHye4PE enzVmNuAEG0i7GnNB8RyTumN23PqlCrj4sPJK1KOnG7s7udzXMa32bwk8H6DiV0kbusB /2wm1YeQkD/g6iXocRua1e7fpkm0d4OlXhXLb2i68R6/PrllHy+k9hkfn96dkwymPt11 jaGPyq2/GK4vp/KqydKSEtVo16mshWAc/yoOwSEyZAigBn9ehXJUcfKvf0xQPUXqWQtL 34GUE33Y148hI5UJJu7O9iG2oJysDgFWEqilb5Zon7uqmyIdKZKMOUEF9bGq+dI1ZMID +2Jw== X-Gm-Message-State: ALoCoQncse/Cgqa0nQCcMH9IhxeqDEohbz+6zzSiZQtItnD2GpfVn+bXdcI5IY2aa5R5T2MABpev X-Received: by 10.194.158.42 with SMTP id wr10mr28170280wjb.81.1435583643057; Mon, 29 Jun 2015 06:14:03 -0700 (PDT) Received: from google.com ([2620:0:1042:1:e5e8:cdc:7b33:cafe]) by mx.google.com with ESMTPSA id di9sm12115056wib.16.2015.06.29.06.14.02 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Mon, 29 Jun 2015 06:14:02 -0700 (PDT) Date: Mon, 29 Jun 2015 14:14:00 +0100 From: Sami Tolvanen To: dm-devel@redhat.com Message-ID: <20150629131400.GA18829@google.com> MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.21 (2010-09-15) X-RedHat-Spam-Score: -3.392 (BAYES_00, DCC_REPUT_13_19, DKIM_SIGNED, DKIM_VALID, DKIM_VALID_AU, RCVD_IN_DNSWL_LOW, RCVD_IN_MSPIKE_H3, RCVD_IN_MSPIKE_WL, RP_MATCHES_RCVD, SPF_PASS) 209.85.212.182 mail-wi0-f182.google.com 209.85.212.182 mail-wi0-f182.google.com X-Scanned-By: MIMEDefang 2.68 on 10.5.11.23 X-Scanned-By: MIMEDefang 2.75 on 10.5.110.28 X-loop: dm-devel@redhat.com Subject: [dm-devel] [PATCH] dm verity: remove unused mempool X-BeenThere: dm-devel@redhat.com X-Mailman-Version: 2.1.12 Precedence: junk Reply-To: device-mapper development List-Id: device-mapper development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: dm-devel-bounces@redhat.com Errors-To: dm-devel-bounces@redhat.com X-Spam-Status: No, score=-4.7 required=5.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED,RCVD_IN_DNSWL_MED,RP_MATCHES_RCVD,T_DKIM_INVALID, UNPARSEABLE_RELAY autolearn=unavailable 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 Since commit 003b5c5719f159f4f4bf97511c4702a0638313dd, vec_mempool in struct dm-verity is no longer used. Remove it and related definitions. Signed-off-by: Sami Tolvanen --- drivers/md/dm-verity.c | 15 --------------- 1 file changed, 15 deletions(-) -- dm-devel mailing list dm-devel@redhat.com https://www.redhat.com/mailman/listinfo/dm-devel diff --git a/drivers/md/dm-verity.c b/drivers/md/dm-verity.c index bb9c6a0..3adb332 100644 --- a/drivers/md/dm-verity.c +++ b/drivers/md/dm-verity.c @@ -26,8 +26,6 @@ #define DM_VERITY_ENV_LENGTH 42 #define DM_VERITY_ENV_VAR_NAME "DM_VERITY_ERR_BLOCK_NR" -#define DM_VERITY_IO_VEC_INLINE 16 -#define DM_VERITY_MEMPOOL_SIZE 4 #define DM_VERITY_DEFAULT_PREFETCH_SIZE 262144 #define DM_VERITY_MAX_LEVELS 63 @@ -76,8 +74,6 @@ struct dm_verity { enum verity_mode mode; /* mode for handling verification errors */ unsigned corrupted_errs;/* Number of errors for corrupted blocks */ - mempool_t *vec_mempool; /* mempool of bio vector */ - struct workqueue_struct *verify_wq; /* starting blocks for each tree level. 0 is the lowest level. */ @@ -691,9 +687,6 @@ static void verity_dtr(struct dm_target *ti) if (v->verify_wq) destroy_workqueue(v->verify_wq); - if (v->vec_mempool) - mempool_destroy(v->vec_mempool); - if (v->bufio) dm_bufio_client_destroy(v->bufio); @@ -962,14 +955,6 @@ static int verity_ctr(struct dm_target *ti, unsigned argc, char **argv) ti->per_bio_data_size = roundup(sizeof(struct dm_verity_io) + v->shash_descsize + v->digest_size * 2, __alignof__(struct dm_verity_io)); - v->vec_mempool = mempool_create_kmalloc_pool(DM_VERITY_MEMPOOL_SIZE, - BIO_MAX_PAGES * sizeof(struct bio_vec)); - if (!v->vec_mempool) { - ti->error = "Cannot allocate vector mempool"; - r = -ENOMEM; - goto bad; - } - /* WQ_UNBOUND greatly improves performance when running on ramdisk */ v->verify_wq = alloc_workqueue("kverityd", WQ_CPU_INTENSIVE | WQ_MEM_RECLAIM | WQ_UNBOUND, num_online_cpus()); if (!v->verify_wq) {