From: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
To: Andrew Morton <akpm@linux-foundation.org>,
Minchan Kim <minchan@kernel.org>
Cc: Nitin Gupta <ngupta@vflare.org>,
linux-kernel@vger.kernel.org,
Sergey Senozhatsky <sergey.senozhatsky.work@gmail.com>,
Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
Subject: [PATCHv4 08/10] zram: return zram device_id from zram_add()
Date: Mon, 4 May 2015 21:39:00 +0900 [thread overview]
Message-ID: <1430743142-15854-9-git-send-email-sergey.senozhatsky@gmail.com> (raw)
In-Reply-To: <1430743142-15854-1-git-send-email-sergey.senozhatsky@gmail.com>
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).
Acked-by: Minchan Kim <minchan@kernel.org>
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@gmail.com>
---
drivers/block/zram/zram_drv.c | 23 ++++++++++++++---------
1 file changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index 37a753c..3df4394 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1151,20 +1151,24 @@ static struct attribute_group zram_disk_attr_group = {
.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 request_queue *queue;
- int ret;
+ int ret, device_id;
zram = kzalloc(sizeof(struct zram), GFP_KERNEL);
if (!zram)
return -ENOMEM;
- ret = idr_alloc(&zram_index_idr, zram, device_id,
- device_id + 1, GFP_KERNEL);
+ ret = idr_alloc(&zram_index_idr, zram, 0, 0, GFP_KERNEL);
if (ret < 0)
goto out_free_dev;
+ device_id = ret;
init_rwsem(&zram->init_lock);
@@ -1238,7 +1242,7 @@ static int zram_add(int device_id)
zram->max_comp_streams = 1;
pr_info("Added device: %s\n", zram->disk->disk_name);
- return 0;
+ return device_id;
out_free_disk:
del_gendisk(zram->disk);
@@ -1285,7 +1289,7 @@ static void destroy_devices(void)
static int __init zram_init(void)
{
- int ret, dev_id;
+ int ret;
zram_major = register_blkdev(0, "zram");
if (zram_major <= 0) {
@@ -1293,10 +1297,11 @@ static int __init zram_init(void)
return -EBUSY;
}
- for (dev_id = 0; dev_id < num_devices; dev_id++) {
- ret = zram_add(dev_id);
- if (ret != 0)
+ while (num_devices != 0) {
+ ret = zram_add();
+ if (ret < 0)
goto out_error;
+ num_devices--;
}
return 0;
--
2.4.0
next prev parent reply other threads:[~2015-05-04 12:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-04 12:38 [PATCHv4 00/10] add on-demand device creation Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 01/10] zram: add `compact` sysfs entry to documentation Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 02/10] zram: cosmetic ZRAM_ATTR_RO code formatting tweak Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 03/10] zram: use idr instead of `zram_devices' array Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 04/10] zram: reorganize code layout Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 05/10] zram: remove max_num_devices limitation Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 06/10] zram: report every added and removed device Sergey Senozhatsky
2015-05-04 12:38 ` [PATCHv4 07/10] zram: trivial: correct flag operations comment Sergey Senozhatsky
2015-05-04 12:39 ` Sergey Senozhatsky [this message]
2015-05-04 12:39 ` [PATCHv4 09/10] zram: close race by open overriding Sergey Senozhatsky
2015-05-04 12:39 ` [PATCHv4 10/10] zram: add dynamic device add/remove functionality Sergey Senozhatsky
2015-05-06 5:01 ` [PATCHv4 00/10] add on-demand device creation Minchan Kim
2015-05-06 5:25 ` Sergey Senozhatsky
2015-05-06 6:52 ` Minchan Kim
2015-05-06 7:07 ` Sergey Senozhatsky
2015-05-06 7:28 ` Minchan Kim
2015-05-06 8:10 ` Sergey Senozhatsky
2015-05-06 8:20 ` Minchan Kim
2015-05-07 0:33 ` Sergey Senozhatsky
2015-05-07 7:41 ` Minchan Kim
2015-05-07 12:09 ` Sergey Senozhatsky
2015-05-07 13:04 ` Sergey Senozhatsky
2015-05-07 15:11 ` Minchan Kim
2015-05-08 0:15 ` Sergey Senozhatsky
2015-05-10 8:47 ` Sergey Senozhatsky
2015-05-06 5:31 ` Sergey Senozhatsky
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1430743142-15854-9-git-send-email-sergey.senozhatsky@gmail.com \
--to=sergey.senozhatsky@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=minchan@kernel.org \
--cc=ngupta@vflare.org \
--cc=sergey.senozhatsky.work@gmail.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).