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

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

Merge "Revert "staging: zram: Rate limit memory allocation errors""

parents 709ba50a d1955698

drivers/block/zram/zram_drv.c

+2 −11
Original line number Diff line number Diff line
@@ -41,12 +41,6 @@ static DEFINE_MUTEX(zram_index_mutex); 
static int zram_major;

static const char *default_compressor = "lzo";



/*

 * We don't need to see memory allocation errors more than once every 1

 * second to know that a problem is occurring.

 */

#define ALLOC_ERROR_LOG_RATE_MS 1000



/* Module params (documentation at end) */

static unsigned int num_devices = 1;
@@ -674,7 +668,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, 
	struct zram_meta *meta = zram->meta;

	struct zcomp_strm *zstrm = NULL;

	unsigned long alloced_pages;

	static unsigned long zram_rs_time;



	page = bvec->bv_page;

	if (is_partial_io(bvec)) {
@@ -769,8 +762,6 @@ static int zram_bvec_write(struct zram *zram, struct bio_vec *bvec, u32 index, 
		if (handle)

			goto compress_again;



		if (printk_timed_ratelimit(&zram_rs_time,

					   ALLOC_ERROR_LOG_RATE_MS))

		pr_err("Error allocating memory for compressed page: %u, size=%u\n",

			index, clen);

		ret = -ENOMEM;