Skip to content

Commit

Permalink
dm verity: remove unused mempool
Browse files Browse the repository at this point in the history
Since commit 003b5c5 ("block: Convert drivers to immutable biovecs"),
vec_mempool in struct dm_verity is no longer used.  Remove it and
related definitions.

Signed-off-by: Sami Tolvanen <samitolvanen@google.com>
Signed-off-by: Mike Snitzer <snitzer@redhat.com>
  • Loading branch information
Sami Tolvanen authored and Mike Snitzer committed Aug 12, 2015
1 parent e44b6a5 commit 4fb9aa5
Showing 1 changed file with 0 additions and 15 deletions.
15 changes: 0 additions & 15 deletions drivers/md/dm-verity.c
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down Expand Up @@ -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. */
Expand Down Expand Up @@ -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);

Expand Down Expand Up @@ -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) {
Expand Down

0 comments on commit 4fb9aa5

Please sign in to comment.