pstore/ram_core: Get rid of prz->ecc_symsize and prz->ecc_poly

The struct members were never used anywhere outside of
persistent_ram_init_ecc(), so there's actually no need for them
to be in the struct.

If we ever want to make polynomial or symbol size configurable,
it would make more sense to just pass initialized rs_decoder
to the persistent_ram init functions.

Signed-off-by: Anton Vorontsov <anton.vorontsov@linaro.org>
Acked-by: Kees Cook <keescook@chromium.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/fs/pstore/ram_core.c b/fs/pstore/ram_core.c
index a5a7b13d358c9abef22490e19e722ffc19d6105c..3f4d6e64f6d7147b5ba684309d90feb97f51e494 100644 (file)
--- a/fs/pstore/ram_core.c
+++ b/fs/pstore/ram_core.c
@@ -177,14 +177,14 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz)
        struct persistent_ram_buffer *buffer = prz->buffer;
        int ecc_blocks;
        size_t ecc_total;
+       int ecc_symsize = 8;
+       int ecc_poly = 0x11d;
 
        if (!prz->ecc)
                return 0;
 
        prz->ecc_block_size = 128;
        prz->ecc_size = 16;
-       prz->ecc_symsize = 8;
-       prz->ecc_poly = 0x11d;
 
        ecc_blocks = DIV_ROUND_UP(prz->buffer_size, prz->ecc_block_size);
        ecc_total = (ecc_blocks + 1) * prz->ecc_size;
@@ -202,8 +202,7 @@ static int persistent_ram_init_ecc(struct persistent_ram_zone *prz)
         * first consecutive root is 0
         * primitive element to generate roots = 1
         */
-       prz->rs_decoder = init_rs(prz->ecc_symsize, prz->ecc_poly, 0, 1,
-                                 prz->ecc_size);
+       prz->rs_decoder = init_rs(ecc_symsize, ecc_poly, 0, 1, prz->ecc_size);
        if (prz->rs_decoder == NULL) {
                pr_info("persistent_ram: init_rs failed\n");
                return -EINVAL;

diff --git a/include/linux/pstore_ram.h b/include/linux/pstore_ram.h
index e681af92c04bb0de3316c58c90c97b842987329a..a0975c02194a196b065d9591c5294ec6a953c9c5 100644 (file)
--- a/include/linux/pstore_ram.h
+++ b/include/linux/pstore_ram.h
@@ -41,8 +41,6 @@ struct persistent_ram_zone {
        int bad_blocks;
        int ecc_block_size;
        int ecc_size;
-       int ecc_symsize;
-       int ecc_poly;
 
        char *old_log;
        size_t old_log_size;