Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 906a828d authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "zram: use zram->lock to protect zram_free_page() in swap free notify path"

parents 3557a24a 938f7296

drivers/staging/zram/zram_drv.c

+2 −0
Original line number Diff line number Diff line
@@ -582,7 +582,9 @@ static void zram_slot_free_notify(struct block_device *bdev, 
	struct zram *zram;



	zram = bdev->bd_disk->private_data;

	down_write(&zram->lock);

	zram_free_page(zram, index);

	up_write(&zram->lock);

	zram_stat64_inc(zram, &zram->stats.notify_free);

}

drivers/staging/zram/zram_drv.h

+3 −2
Original line number Diff line number Diff line
@@ -93,8 +93,9 @@ struct zram_meta { 
struct zram {

	struct zram_meta *meta;

	spinlock_t stat64_lock;	/* protect 64-bit stats */

	struct rw_semaphore lock; /* protect compression buffers and table

				   * against concurrent read and writes */

	struct rw_semaphore lock; /* protect compression buffers, table,

				   * 32bit stat counters against concurrent

				   * notifications, reads and writes */

	struct request_queue *queue;

	struct gendisk *disk;

	int init_done;