diff options
| author | Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | 2014-04-07 15:38:12 -0700 |
|---|---|---|
| committer | Mister Oyster <oysterized@gmail.com> | 2016-12-11 13:00:47 +0100 |
| commit | 7817e3e3d3efc5b806617cf7233853321994aeb0 (patch) | |
| tree | 0d13585883a2ed710520539023d041c40349ba40 /include/linux | |
| parent | 433993ee94146a5e96baed9799c851ae48b34a46 (diff) | |
zram: use zcomp compressing backends
Do not perform direct LZO compress/decompress calls, initialise
and use zcomp LZO backend (single compression stream) instead.
[akpm@linux-foundation.org: resolve conflicts with zram-delete-zram_init_device-fix.patch]
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Cc: Jerome Marchand <jmarchan@redhat.com>
Cc: Nitin Gupta <ngupta@vflare.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Conflicts:
drivers/block/zram/zram_drv.c
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/zram_drv.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/include/linux/zram_drv.h b/include/linux/zram_drv.h index 1262b4be2..4daeff5f5 100644 --- a/include/linux/zram_drv.h +++ b/include/linux/zram_drv.h @@ -16,9 +16,10 @@ #define _ZRAM_DRV_H_ #include <linux/spinlock.h> -#include <linux/mutex.h> #include <linux/zsmalloc.h> +#include "zcomp.h" + /* * Some arbitrary value. This is just to catch * invalid value for num_devices module parameter. @@ -81,17 +82,16 @@ struct zram_stats { struct zram_meta { rwlock_t tb_lock; /* protect table */ - void *compress_workmem; - void *compress_buffer; struct table *table; struct zs_pool *mem_pool; - struct mutex buffer_lock; /* protect compress buffers */ }; struct zram { struct zram_meta *meta; struct request_queue *queue; struct gendisk *disk; + struct zcomp *comp; + /* Prevent concurrent execution of device init, reset and R/W request */ struct rw_semaphore init_lock; /* |