diff options
author | Sergey Senozhatsky <sergey.senozhatsky@gmail.com> | 2013-06-26 15:28:39 +0300 |
---|---|---|
committer | Chanho Park <chanho61.park@samsung.com> | 2014-03-20 17:44:27 +0900 |
commit | 88c9d884f7dc8ba4dcd06a0a551230fb51346a40 (patch) | |
tree | 0a7252e3cb1206431b0cd64685cbb1fc2b90b789 | |
parent | 3f80fa78947be146caba45541e09e81c391aa70b (diff) | |
download | linux-3.10-88c9d884f7dc8ba4dcd06a0a551230fb51346a40.tar.gz linux-3.10-88c9d884f7dc8ba4dcd06a0a551230fb51346a40.tar.bz2 linux-3.10-88c9d884f7dc8ba4dcd06a0a551230fb51346a40.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: Ia8cd8eb9eae37ccc142efc1c21980076f2aa007d
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>
-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 5ef6508a587..7ebf91d347f 100644 --- a/drivers/staging/zram/zram_drv.c +++ b/drivers/staging/zram/zram_drv.c @@ -528,8 +528,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; @@ -550,6 +553,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) |