Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 60571c7d authored by Alex Elder's avatar Alex Elder
Browse files

rbd: reduce memory used for rbd_dev fields 



The length of the string containing the monitor address
specification(s) will never exceed the length of the string passed
in to rbd_add().  The same holds true for the ceph + rbd options
string.  So reduce the amount of memory allocated for these to
that length rather than the maximum (1024 bytes).

Signed-off-by: default avatarAlex Elder <elder@dreamhost.com>
Signed-off-by: default avatarSage Weil <sage@newdream.net>
parent d720bcb0

drivers/block/rbd.c

+2 −2
Original line number Original line Diff line number Diff line
@@ -2234,11 +2234,11 @@ static ssize_t rbd_add(struct bus_type *bus, 
	if (!try_module_get(THIS_MODULE))

	if (!try_module_get(THIS_MODULE))

		return -ENODEV;

		return -ENODEV;





	mon_dev_name = kmalloc(RBD_MAX_OPT_LEN, GFP_KERNEL);

	mon_dev_name = kmalloc(count, GFP_KERNEL);

	if (!mon_dev_name)

	if (!mon_dev_name)

		goto err_out_mod;

		goto err_out_mod;





	options = kmalloc(RBD_MAX_OPT_LEN, GFP_KERNEL);

	options = kmalloc(count, GFP_KERNEL);

	if (!options)

	if (!options)

		goto err_mon_dev;

		goto err_mon_dev;