diff options
| author | Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | 2013-06-26 15:28:39 +0300 |
|---|---|---|
| committer | Simon Shields <keepcalm444@gmail.com> | 2016-06-12 21:19:44 +1000 |
| commit | a13825f39ca024eb785b6fcbc0a9f806f89f55ec (patch) | |
| tree | 9a45da9fc5abc68fd586d1dc53ab4ab17ee9494c /drivers/staging | |
| parent | 843651d740ac98689c1a0055df4f77a271c3d75c (diff) | |
| download | kernel_samsung_smdk4412-a13825f39ca024eb785b6fcbc0a9f806f89f55ec.tar.gz kernel_samsung_smdk4412-a13825f39ca024eb785b6fcbc0a9f806f89f55ec.tar.bz2 kernel_samsung_smdk4412-a13825f39ca024eb785b6fcbc0a9f806f89f55ec.zip | |
staging: zram: protect zram_reset_device() call
Commit 9b3bb7abcdf2df0f1b2657e6cbc9d06bc2b3b36f (remove
zram_sysfs file (v2)) accidentally made zram_reset_device()
racy. Protect zram_reset_device() call with zram->lock.
Change-Id: I93ce19f9b262584f4ef805dce5ed4de9b3968a30
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Jerome Marchand <jmarchand@redhat.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Git-commit: 644d478793c6594277f8ae76954da4ace7ac6f96
Git-repo: git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
Signed-off-by: Olav Haugan <ohaugan@codeaurora.org>
Diffstat (limited to 'drivers/staging')
| -rw-r--r-- | drivers/staging/zram/zram_drv.c | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/drivers/staging/zram/zram_drv.c b/drivers/staging/zram/zram_drv.c index 5a795cad416..d4f66e3ae83 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -527,8 +527,11 @@ static void zram_reset_device(struct zram *zram) size_t index; struct zram_meta *meta; - if (!zram->init_done) + down_write(&zram->init_lock); + if (!zram->init_done) { + up_write(&zram->init_lock); return; + } meta = zram->meta; zram->init_done = 0; @@ -549,6 +552,7 @@ static void zram_reset_device(struct zram *zram) zram->disksize = 0; set_capacity(zram->disk, 0); + up_write(&zram->init_lock); } static void zram_init_device(struct zram *zram, struct zram_meta *meta) |