summaryrefslogtreecommitdiff
path: root/drivers/block/loop.c
diff options
context:
space:
mode:
authorRussell King <rmk@flint.arm.linux.org.uk>2002-04-04 11:45:09 +0100
committerRussell King <rmk@flint.arm.linux.org.uk>2002-04-04 11:45:09 +0100
commit94394e5bc92026a2ff31cd03e11e015adfdb3260 (patch)
tree8f24a3e60e98d45ba7416821aadb84508e18d79d /drivers/block/loop.c
parent3f4d4f4e46865cb01d2e2717c6906e2ae079c042 (diff)
parent5e4b50795ee8c7659a1181cea4c98712e02ea63e (diff)
Merge flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5
into flint.arm.linux.org.uk:/usr/src/linux-bk-2.5/linux-2.5-rmk
Diffstat (limited to 'drivers/block/loop.c')
-rw-r--r--drivers/block/loop.c9
1 files changed, 6 insertions, 3 deletions
diff --git a/drivers/block/loop.c b/drivers/block/loop.c
index cfce7b234c57..cabf25eff926 100644
--- a/drivers/block/loop.c
+++ b/drivers/block/loop.c
@@ -36,6 +36,9 @@
* Al Viro too.
* Jens Axboe <axboe@suse.de>, Nov 2000
*
+ * Support up to 256 loop devices
+ * Heinz Mauelshagen <mge@sistina.com>, Feb 2002
+ *
* Still To Fix:
* - Advisory locking is ignored here.
* - Should use an own CAP_* category instead of CAP_SYS_ADMIN
@@ -927,7 +930,7 @@ static struct block_device_operations lo_fops = {
* And now the modules code and kernel interface.
*/
MODULE_PARM(max_loop, "i");
-MODULE_PARM_DESC(max_loop, "Maximum number of loop devices (1-255)");
+MODULE_PARM_DESC(max_loop, "Maximum number of loop devices (1-256)");
MODULE_LICENSE("GPL");
int loop_register_transfer(struct loop_func_table *funcs)
@@ -963,9 +966,9 @@ int __init loop_init(void)
{
int i;
- if ((max_loop < 1) || (max_loop > 255)) {
+ if ((max_loop < 1) || (max_loop > 256)) {
printk(KERN_WARNING "loop: invalid max_loop (must be between"
- " 1 and 255), using default (8)\n");
+ " 1 and 256), using default (8)\n");
max_loop = 8;
}