The patch titled
Subject: zram: return zram device_id value from zram_add()
has been removed from the -mm tree. Its filename was
zram-return-zram-device_id-value-from-zram_add.patch
This patch was dropped because an updated version will be merged
------------------------------------------------------
From: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Subject: zram: return zram device_id value from zram_add()
zram_add requires valid device_id to be provided, that can be a bit
inconvenient. Change zram_add() to return negative value upon new device
creation failure, and device_id (>= 0) value otherwise.
This prepares zram_add to perform automatic device_id assignment. New
device_id will be returned back to user-space (so user can reference that
device as /dev/zramX).
Signed-off-by: Sergey Senozhatsky <sergey.senozhatsky@xxxxxxxxx>
Cc: Minchan Kim <minchan@xxxxxxxxxx>
Cc: Nitin Gupta <ngupta@xxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
drivers/block/zram/zram_drv.c | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff -puN drivers/block/zram/zram_drv.c~zram-return-zram-device_id-value-from-zram_add drivers/block/zram/zram_drv.c
--- a/drivers/block/zram/zram_drv.c~zram-return-zram-device_id-value-from-zram_add
+++ a/drivers/block/zram/zram_drv.c
@@ -1128,6 +1128,8 @@ static struct attribute_group zram_disk_
.attrs = zram_disk_attrs,
};
+/* allocate and initialize new zram device. the function returns
+ * '>= 0' device_id upon success, and negative value otherwise. */
static int zram_add(int device_id)
{
struct zram *zram;
@@ -1214,7 +1216,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);
@@ -1389,7 +1391,7 @@ static int __init zram_init(void)
mutex_lock(&zram_index_mutex);
ret = zram_add(dev_id);
mutex_unlock(&zram_index_mutex);
- if (ret != 0)
+ if (ret < 0)
goto out_error;
}
_
Patches currently in -mm which might be from sergey.senozhatsky@xxxxxxxxx are
origin.patch
revert-zram-move-compact_store-to-sysfs-functions-area.patch
zram-introduce-automatic-device_id-generation.patch
zram-introduce-automatic-device_id-generation-fix.patch
zram-do-not-let-user-enforce-new-device-dev_id.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
