12 Oct
2021
12 Oct
'21
1:58 a.m.
From: Kees Cook <keescook(a)chromium.org>
stable inclusion
from stable-5.10
category: feature
commit:d973f7d83dc7360597373536b34e80eea306d15f
issue: #I4919J
--------------------------------
It is easier to see how module params are used if they're near the
variables they use.
Link: https://lore.kernel.org/lkml/20200510202436.63222-4-keescook@chromium.org/
Signed-off-by: Kees Cook <keescook(a)chromium.org>
(cherry picked from commit d973f7d83dc7360597373536b34e80eea306d15f)
Signed-off-by: roger <kongzhengrong(a)huawei.com>
---
fs/pstore/platform.c | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/fs/pstore/platform.c b/fs/pstore/platform.c
index 53d59cedef3d..310034809594 100644
--- a/fs/pstore/platform.c
+++ b/fs/pstore/platform.c
@@ -88,12 +88,17 @@ static DEFINE_SPINLOCK(pstore_lock);
struct pstore_info *psinfo;
static char *backend;
+module_param(backend, charp, 0444);
+MODULE_PARM_DESC(backend, "specific backend to use");
+
static char *compress =
#ifdef CONFIG_PSTORE_COMPRESS_DEFAULT
CONFIG_PSTORE_COMPRESS_DEFAULT;
#else
NULL;
#endif
+module_param(compress, charp, 0444);
+MODULE_PARM_DESC(compress, "compression to use");
/* Compression parameters */
static struct crypto_comp *tfm;
@@ -858,11 +863,5 @@ static void __exit pstore_exit(void)
}
module_exit(pstore_exit)
-module_param(compress, charp, 0444);
-MODULE_PARM_DESC(compress, "Pstore compression to use");
-
-module_param(backend, charp, 0444);
-MODULE_PARM_DESC(backend, "Pstore backend to use");
-
MODULE_AUTHOR("Tony Luck <tony.luck(a)intel.com>")>");
MODULE_LICENSE("GPL");
--
2.17.1