hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

zram: return zram device_id from zram_add() 

This patch prepares zram to enable on-demand device creation.
zram_add() performs automatic device_id assignment and returns
new device id (>= 0) or error code (< 0).

Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Andrew Morton <akpm@linux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
Sergey Senozhatsky 2015-06-25 15:00:19 -07:00 committed by Linus Torvalds
parent b31177f2a9
commit 92ff152887
1 changed files with 14 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
drivers/block/zram/zram_drv.c
View File

@ -1153,20 +1153,24 @@ static struct attribute_group zram_disk_attr_group = {
.attrs = zram_disk_attrs, .attrs = zram_disk_attrs,
}; };
static int zram_add(int device_id) /*
* Allocate and initialize new zram device. the function returns
* '>= 0' device_id upon success, and negative value otherwise.
*/
static int zram_add(void)
{ {
struct zram *zram; struct zram *zram;
struct request_queue *queue; struct request_queue *queue;
int ret; int ret, device_id;
zram = kzalloc(sizeof(struct zram), GFP_KERNEL); zram = kzalloc(sizeof(struct zram), GFP_KERNEL);
if (!zram) if (!zram)
return -ENOMEM; return -ENOMEM;
ret = idr_alloc(&zram_index_idr, zram, device_id, ret = idr_alloc(&zram_index_idr, zram, 0, 0, GFP_KERNEL);
device_id + 1, GFP_KERNEL);
if (ret < 0) if (ret < 0)
goto out_free_dev; goto out_free_dev;
device_id = ret;
init_rwsem(&zram->init_lock); init_rwsem(&zram->init_lock);
@ -1240,7 +1244,7 @@ static int zram_add(int device_id)
zram->max_comp_streams = 1; zram->max_comp_streams = 1;
pr_info("Added device: %s\n", zram->disk->disk_name); pr_info("Added device: %s\n", zram->disk->disk_name);
return 0; return device_id;
out_free_disk: out_free_disk:
del_gendisk(zram->disk); del_gendisk(zram->disk);
@ -1287,7 +1291,7 @@ static void destroy_devices(void)
static int __init zram_init(void) static int __init zram_init(void)
{ {
int ret, dev_id; int ret;
zram_major = register_blkdev(0, "zram"); zram_major = register_blkdev(0, "zram");
if (zram_major <= 0) { if (zram_major <= 0) {
@ -1295,10 +1299,11 @@ static int __init zram_init(void)
return -EBUSY; return -EBUSY;
} }
for (dev_id = 0; dev_id < num_devices; dev_id++) { while (num_devices != 0) {
ret = zram_add(dev_id); ret = zram_add();
if (ret != 0) if (ret < 0)
goto out_error; goto out_error;
num_devices--;
} }
return 0; return 0;