aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSergey Senozhatsky <sergey.senozhatsky@gmail.com>2015-05-14 01:01:52 +0000
committerJohannes Weiner <hannes@cmpxchg.org>2015-05-14 01:01:52 +0000
commitf15f95aa0e14fc5a1009e8a5819bd4abdcf50e21 (patch)
tree3ce026eb5aa01e9ff5f441c01e3ef10c35f1f30e
parent274ef384c877a9f6cb9c3d68c5001e74481dbacf (diff)
downloadmm-next-f15f95aa0e14fc5a1009e8a5819bd4abdcf50e21.tar.gz
zram: report every added and removed device
With dynamic device creation/removal (which will be introduced later in the series) printing num_devices in zram_init() will not make a lot of sense, as well as printing the number of destroyed devices in destroy_devices(). Print per-device action (added/removed) in zram_add() and zram_remove() instead. Example: [ 3645.259652] zram: Added device: zram5 [ 3646.152074] zram: Added device: zram6 [ 3650.585012] zram: Removed device: zram5 [ 3655.845584] zram: Added device: zram8 [ 3660.975223] zram: Removed device: zram6 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>
-rw-r--r--drivers/block/zram/zram_drv.c5
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/block/zram/zram_drv.c b/drivers/block/zram/zram_drv.c
index b8755171cf6d13..ec6396cf5f570e 100644
--- a/drivers/block/zram/zram_drv.c
+++ b/drivers/block/zram/zram_drv.c
@@ -1236,6 +1236,8 @@ static int zram_add(int device_id)
strlcpy(zram->compressor, default_compressor, sizeof(zram->compressor));
zram->meta = NULL;
zram->max_comp_streams = 1;
+
+ pr_info("Added device: %s\n", zram->disk->disk_name);
return 0;
out_free_disk:
@@ -1252,6 +1254,7 @@ out_free_dev:
static void zram_remove(struct zram *zram)
{
+ pr_info("Removed device: %s\n", zram->disk->disk_name);
/*
* Remove sysfs first, so no one will perform a disksize
* store while we destroy the devices
@@ -1278,7 +1281,6 @@ static void destroy_devices(void)
idr_for_each(&zram_index_idr, &zram_remove_cb, NULL);
idr_destroy(&zram_index_idr);
unregister_blkdev(zram_major, "zram");
- pr_info("Destroyed device(s)\n");
}
static int __init zram_init(void)
@@ -1297,7 +1299,6 @@ static int __init zram_init(void)
goto out_error;
}
- pr_info("Created %u device(s)\n", num_devices);
return 0;
out_error: