Merge tag 'nbd_fixes_20150305' of git://git.pengutronix.de/git/mpa/linux-nbd into for-linus (b8be79b7) · Commits · e / devices / android_kernel_samsung_universal8895

drivers/block/nbd.c

+4 −4

Original line number	Diff line number	Diff line
		@@ -803,10 +803,6 @@ static int __init nbd_init(void)
		return -EINVAL;
		}

		nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
		if (!nbd_dev)
		return -ENOMEM;

		part_shift = 0;
		if (max_part > 0) {
		part_shift = fls(max_part);
		@@ -828,6 +824,10 @@ static int __init nbd_init(void)
		if (nbds_max > 1UL << (MINORBITS - part_shift))
		return -EINVAL;

		nbd_dev = kcalloc(nbds_max, sizeof(*nbd_dev), GFP_KERNEL);
		if (!nbd_dev)
		return -ENOMEM;

		for (i = 0; i < nbds_max; i++) {
		struct gendisk *disk = alloc_disk(1 << part_shift);
		if (!disk)