|
@@ -1996,10 +1996,6 @@ static int __init loop_init(void)
|
|
struct loop_device *lo;
|
|
struct loop_device *lo;
|
|
int err;
|
|
int err;
|
|
|
|
|
|
- err = misc_register(&loop_misc);
|
|
|
|
- if (err < 0)
|
|
|
|
- return err;
|
|
|
|
-
|
|
|
|
part_shift = 0;
|
|
part_shift = 0;
|
|
if (max_part > 0) {
|
|
if (max_part > 0) {
|
|
part_shift = fls(max_part);
|
|
part_shift = fls(max_part);
|
|
@@ -2017,12 +2013,12 @@ static int __init loop_init(void)
|
|
|
|
|
|
if ((1UL << part_shift) > DISK_MAX_PARTS) {
|
|
if ((1UL << part_shift) > DISK_MAX_PARTS) {
|
|
err = -EINVAL;
|
|
err = -EINVAL;
|
|
- goto misc_out;
|
|
|
|
|
|
+ goto err_out;
|
|
}
|
|
}
|
|
|
|
|
|
if (max_loop > 1UL << (MINORBITS - part_shift)) {
|
|
if (max_loop > 1UL << (MINORBITS - part_shift)) {
|
|
err = -EINVAL;
|
|
err = -EINVAL;
|
|
- goto misc_out;
|
|
|
|
|
|
+ goto err_out;
|
|
}
|
|
}
|
|
|
|
|
|
/*
|
|
/*
|
|
@@ -2041,6 +2037,11 @@ static int __init loop_init(void)
|
|
range = 1UL << MINORBITS;
|
|
range = 1UL << MINORBITS;
|
|
}
|
|
}
|
|
|
|
|
|
|
|
+ err = misc_register(&loop_misc);
|
|
|
|
+ if (err < 0)
|
|
|
|
+ goto err_out;
|
|
|
|
+
|
|
|
|
+
|
|
if (register_blkdev(LOOP_MAJOR, "loop")) {
|
|
if (register_blkdev(LOOP_MAJOR, "loop")) {
|
|
err = -EIO;
|
|
err = -EIO;
|
|
goto misc_out;
|
|
goto misc_out;
|
|
@@ -2060,6 +2061,7 @@ static int __init loop_init(void)
|
|
|
|
|
|
misc_out:
|
|
misc_out:
|
|
misc_deregister(&loop_misc);
|
|
misc_deregister(&loop_misc);
|
|
|
|
+err_out:
|
|
return err;
|
|
return err;
|
|
}
|
|
}
|
|
|
|
|