From 34bed028f6e81b9cd125e80baa88ed581d06507a Mon Sep 17 00:00:00 2001 From: Kent Overstreet Date: Wed, 21 Nov 2018 07:16:28 -0500 Subject: bcachefs: fix mempool double initialization --- fs/bcachefs/compress.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/fs/bcachefs/compress.c b/fs/bcachefs/compress.c index 6379905bad7b..e74fc1f8aee5 100644 --- a/fs/bcachefs/compress.c +++ b/fs/bcachefs/compress.c @@ -601,11 +601,13 @@ have_compressed: goto out; } - ret = mempool_init_kmalloc_pool( - &c->decompress_workspace, - 1, decompress_workspace_size); - if (ret) - goto out; + if (!mempool_initialized(&c->decompress_workspace)) { + ret = mempool_init_kmalloc_pool( + &c->decompress_workspace, + 1, decompress_workspace_size); + if (ret) + goto out; + } out: pr_verbose_init(c->opts, "ret %i", ret); return ret; -- cgit v1.2.3