From: Nick Terrell <nickrterrell@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: linux-crypto@vger.kernel.org, linux-btrfs@vger.kernel.org,
squashfs-devel@lists.sourceforge.net,
linux-f2fs-devel@lists.sourceforge.net,
linux-kernel@vger.kernel.org, Kernel Team <Kernel-team@fb.com>,
Nick Terrell <nickrterrell@gmail.com>,
Nick Terrell <terrelln@fb.com>, Chris Mason <clm@fb.com>,
Petr Malat <oss@malat.biz>, Johannes Weiner <jweiner@fb.com>,
Niket Agarwal <niketa@fb.com>, Yann Collet <cyan@fb.com>
Subject: [PATCH v5 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd
Date: Mon, 2 Nov 2020 22:05:28 -0800 [thread overview]
Message-ID: <20201103060535.8460-3-nickrterrell@gmail.com> (raw)
In-Reply-To: <20201103060535.8460-1-nickrterrell@gmail.com>
From: Nick Terrell <terrelln@fb.com>
Adds decompress_sources.h which includes every .c file necessary for
zstd decompression. This is used in decompress_unzstd.c so the internal
structure of the library isn't exposed.
This allows us to upgrade the zstd library version without modifying any
callers. Instead we just need to update decompress_sources.h.
Signed-off-by: Nick Terrell <terrelln@fb.com>
---
lib/decompress_unzstd.c | 6 +-----
lib/zstd/decompress_sources.h | 14 ++++++++++++++
2 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 lib/zstd/decompress_sources.h
diff --git a/lib/decompress_unzstd.c b/lib/decompress_unzstd.c
index 6bb805aeec08..3c6ad01ffcd5 100644
--- a/lib/decompress_unzstd.c
+++ b/lib/decompress_unzstd.c
@@ -68,11 +68,7 @@
#ifdef STATIC
# define UNZSTD_PREBOOT
# include "xxhash.c"
-# include "zstd/entropy_common.c"
-# include "zstd/fse_decompress.c"
-# include "zstd/huf_decompress.c"
-# include "zstd/zstd_common.c"
-# include "zstd/decompress.c"
+# include "zstd/decompress_sources.h"
#endif
#include <linux/decompress/mm.h>
diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h
new file mode 100644
index 000000000000..ccb4960ea0cd
--- /dev/null
+++ b/lib/zstd/decompress_sources.h
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/*
+ * This file includes every .c file needed for decompression.
+ * It is used by lib/decompress_unzstd.c to include the decompression
+ * source into the translation-unit, so it can be used for kernel
+ * decompression.
+ */
+
+#include "entropy_common.c"
+#include "fse_decompress.c"
+#include "huf_decompress.c"
+#include "zstd_common.c"
+#include "decompress.c"
--
2.28.0
WARNING: multiple messages have this Message-ID (diff)
From: Nick Terrell <nickrterrell@gmail.com>
To: Herbert Xu <herbert@gondor.apana.org.au>
Cc: squashfs-devel@lists.sourceforge.net,
Johannes Weiner <jweiner@fb.com>,
Nick Terrell <nickrterrell@gmail.com>, Yann Collet <cyan@fb.com>,
linux-kernel@vger.kernel.org,
linux-f2fs-devel@lists.sourceforge.net,
Petr Malat <oss@malat.biz>, Chris Mason <clm@fb.com>,
Nick Terrell <terrelln@fb.com>,
linux-crypto@vger.kernel.org, Kernel Team <Kernel-team@fb.com>,
Niket Agarwal <niketa@fb.com>,
linux-btrfs@vger.kernel.org
Subject: [f2fs-dev] [PATCH v5 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd
Date: Mon, 2 Nov 2020 22:05:28 -0800 [thread overview]
Message-ID: <20201103060535.8460-3-nickrterrell@gmail.com> (raw)
In-Reply-To: <20201103060535.8460-1-nickrterrell@gmail.com>
From: Nick Terrell <terrelln@fb.com>
Adds decompress_sources.h which includes every .c file necessary for
zstd decompression. This is used in decompress_unzstd.c so the internal
structure of the library isn't exposed.
This allows us to upgrade the zstd library version without modifying any
callers. Instead we just need to update decompress_sources.h.
Signed-off-by: Nick Terrell <terrelln@fb.com>
---
lib/decompress_unzstd.c | 6 +-----
lib/zstd/decompress_sources.h | 14 ++++++++++++++
2 files changed, 15 insertions(+), 5 deletions(-)
create mode 100644 lib/zstd/decompress_sources.h
diff --git a/lib/decompress_unzstd.c b/lib/decompress_unzstd.c
index 6bb805aeec08..3c6ad01ffcd5 100644
--- a/lib/decompress_unzstd.c
+++ b/lib/decompress_unzstd.c
@@ -68,11 +68,7 @@
#ifdef STATIC
# define UNZSTD_PREBOOT
# include "xxhash.c"
-# include "zstd/entropy_common.c"
-# include "zstd/fse_decompress.c"
-# include "zstd/huf_decompress.c"
-# include "zstd/zstd_common.c"
-# include "zstd/decompress.c"
+# include "zstd/decompress_sources.h"
#endif
#include <linux/decompress/mm.h>
diff --git a/lib/zstd/decompress_sources.h b/lib/zstd/decompress_sources.h
new file mode 100644
index 000000000000..ccb4960ea0cd
--- /dev/null
+++ b/lib/zstd/decompress_sources.h
@@ -0,0 +1,14 @@
+// SPDX-License-Identifier: GPL-2.0-only
+
+/*
+ * This file includes every .c file needed for decompression.
+ * It is used by lib/decompress_unzstd.c to include the decompression
+ * source into the translation-unit, so it can be used for kernel
+ * decompression.
+ */
+
+#include "entropy_common.c"
+#include "fse_decompress.c"
+#include "huf_decompress.c"
+#include "zstd_common.c"
+#include "decompress.c"
--
2.28.0
_______________________________________________
Linux-f2fs-devel mailing list
Linux-f2fs-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/linux-f2fs-devel
next prev parent reply other threads:[~2020-11-03 6:02 UTC|newest]
Thread overview: 51+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 6:05 [GIT PULL][PATCH v5 0/9] Update to zstd-1.4.6 Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 1/9] lib: zstd: Add zstd compatibility wrapper Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-06 18:38 ` Christoph Hellwig
2020-11-06 18:38 ` [f2fs-dev] " Christoph Hellwig
2020-11-09 19:01 ` Chris Mason
2020-11-09 19:01 ` [f2fs-dev] " Chris Mason via Linux-f2fs-devel
2020-11-10 15:25 ` David Sterba
2020-11-10 15:25 ` [f2fs-dev] " David Sterba
2020-11-10 19:33 ` Nick Terrell
2020-11-10 19:33 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel
2020-11-10 18:39 ` Christoph Hellwig
2020-11-10 18:39 ` [f2fs-dev] " Christoph Hellwig
2020-11-10 19:24 ` Chris Mason
2020-11-10 19:24 ` [f2fs-dev] " Chris Mason via Linux-f2fs-devel
2020-11-16 16:52 ` Christoph Hellwig
2020-11-16 16:52 ` [f2fs-dev] " Christoph Hellwig
2020-11-10 20:38 ` Nick Terrell
2020-11-10 20:38 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel
2020-11-03 6:05 ` Nick Terrell [this message]
2020-11-03 6:05 ` [f2fs-dev] [PATCH v5 2/9] lib: zstd: Add decompress_sources.h for decompress_unzstd Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] [PATCH v5 3/9] lib: zstd: Upgrade to latest upstream zstd version 1.4.6 Nick Terrell
2020-11-03 6:05 ` Nick Terrell
2020-11-13 9:36 ` kernel test robot
2020-11-13 9:36 ` kernel test robot
2020-11-13 9:36 ` [PATCH] lib: zstd: fix semicolon.cocci warnings kernel test robot
2020-11-13 9:36 ` kernel test robot
2020-11-13 9:36 ` [f2fs-dev] " kernel test robot
2020-11-14 23:06 ` [PATCH v5 3/9] lib: zstd: Upgrade to latest upstream zstd version 1.4.6 kernel test robot
2020-11-14 23:06 ` kernel test robot
2020-11-03 6:05 ` [PATCH v5 4/9] crypto: zstd: Switch to zstd-1.4.6 API Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 5/9] btrfs: zstd: Switch to the " Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-06 17:10 ` Josef Bacik
2020-11-06 17:10 ` [f2fs-dev] " Josef Bacik
2020-11-06 18:36 ` Nick Terrell
2020-11-06 18:36 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel
2020-11-03 6:05 ` [PATCH v5 6/9] f2fs: " Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 7/9] squashfs: " Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 8/9] lib: unzstd: " Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-03 6:05 ` [PATCH v5 9/9] lib: zstd: Remove zstd compatibility wrapper Nick Terrell
2020-11-03 6:05 ` [f2fs-dev] " Nick Terrell
2020-11-06 17:15 ` [GIT PULL][PATCH v5 0/9] Update to zstd-1.4.6 Josef Bacik
2020-11-06 17:15 ` [f2fs-dev] " Josef Bacik
2020-11-06 18:51 ` Nick Terrell
2020-11-06 18:51 ` [f2fs-dev] " Nick Terrell via Linux-f2fs-devel
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20201103060535.8460-3-nickrterrell@gmail.com \
--to=nickrterrell@gmail.com \
--cc=Kernel-team@fb.com \
--cc=clm@fb.com \
--cc=cyan@fb.com \
--cc=herbert@gondor.apana.org.au \
--cc=jweiner@fb.com \
--cc=linux-btrfs@vger.kernel.org \
--cc=linux-crypto@vger.kernel.org \
--cc=linux-f2fs-devel@lists.sourceforge.net \
--cc=linux-kernel@vger.kernel.org \
--cc=niketa@fb.com \
--cc=oss@malat.biz \
--cc=squashfs-devel@lists.sourceforge.net \
--cc=terrelln@fb.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.