|
@@ -496,10 +496,9 @@ static void zram_meta_free(struct zram_meta *meta, u64 disksize)
|
|
|
kfree(meta);
|
|
|
}
|
|
|
|
|
|
-static struct zram_meta *zram_meta_alloc(int device_id, u64 disksize)
|
|
|
+static struct zram_meta *zram_meta_alloc(char *pool_name, u64 disksize)
|
|
|
{
|
|
|
size_t num_pages;
|
|
|
- char pool_name[8];
|
|
|
struct zram_meta *meta = kmalloc(sizeof(*meta), GFP_KERNEL);
|
|
|
|
|
|
if (!meta)
|
|
@@ -512,7 +511,6 @@ static struct zram_meta *zram_meta_alloc(int device_id, u64 disksize)
|
|
|
goto out_error;
|
|
|
}
|
|
|
|
|
|
- snprintf(pool_name, sizeof(pool_name), "zram%d", device_id);
|
|
|
meta->mem_pool = zs_create_pool(pool_name, GFP_NOIO | __GFP_HIGHMEM);
|
|
|
if (!meta->mem_pool) {
|
|
|
pr_err("Error creating memory pool\n");
|
|
@@ -1031,7 +1029,7 @@ static ssize_t disksize_store(struct device *dev,
|
|
|
return -EINVAL;
|
|
|
|
|
|
disksize = PAGE_ALIGN(disksize);
|
|
|
- meta = zram_meta_alloc(zram->disk->first_minor, disksize);
|
|
|
+ meta = zram_meta_alloc(zram->disk->disk_name, disksize);
|
|
|
if (!meta)
|
|
|
return -ENOMEM;
|
|
|
|