Ramdisks of different sizes
PATCH 1/1 Ramdisks of different sizes
Hi all,
I've just written a patch for the rd code to allow the user to specify more than one ramdisk size. I altered the rd_size parameter for the rd module to be of charp type instead of int.
This will still work identically with modprobe/modutils, but you can specify multiple sizes by supplying a comma-separated list. The last value is used for the remainder of the ram disks you didn't specify, so it's backwards-compatible.
This is very useful when you have an initrd of about 4MB, but want to use larger ramdisk, for example a 2GB hdd-backed ramdisk.
Regards,
Wilco Baan Hofman
drivers/block/rd.c +51 -8
@@ -74,7 +74,8 @@* architecture-specific setup routine (from the stored boot sector * information). */ -int rd_size =CONFIG_BLK_DEV_RAM_SIZE ;/* Size of the RAM disks */ +static char *rd_size =NULL ;/* [SYN] The string with sizes */ +int rd_sizes[CONFIG_BLK_DEV_RAM_COUNT ];/* [SYN] Sizes of the RAM disks */ /* * It would be very desirable to have a soft-blocksize (that in the case * of the ramdisk driver is also the hardblocksize ;) of PAGE_SIZE because
@@ -420,8 +421,9 @@*/ static int __init rd_init (void ) { -int i; +int i, cnt;int err = -ENOMEM ; +char *size_ptr;if (rd_blocksize >PAGE_SIZE || rd_blocksize <512 || (rd_blocksize & (rd_blocksize-1 ))) {
@@ -430,6 +432,47 @@ rd_blocksize =BLOCK_SIZE ; } + +/* [SYN] Extract the ram disk sizes from rd_size if applicable. */ +if (rd_size !=NULL ) { + size_ptr = rd_size; +for (i =0 , cnt =0 ; ; i++) { +if (rd_size[i] ==',' ) { + rd_size[i] ='\0' ; +printk ("rd: ramdisk %d: %sK size\n" , cnt, + size_ptr); + rd_sizes[cnt] =simple_strtol (size_ptr,NULL , +0 ); + + cnt++; + size_ptr = rd_size + (i+1 ); +continue ; + } +if (rd_size[i] =='\0' ) { +printk ("rd: ramdisk %d-%d: %sK size\n" , cnt, +CONFIG_BLK_DEV_RAM_COUNT , + size_ptr); + rd_sizes[cnt] =simple_strtol (size_ptr,NULL , +0 ); + +/* [SYN] The last value changes the size for the +* rest. Backwards compatibility measure. */ +for (i = cnt +1 ; + i <CONFIG_BLK_DEV_RAM_COUNT ; + i++) { + + rd_sizes[i] = rd_sizes[cnt]; + } +break ; + } + } + }else { +/* [SYN] Fill the block sizes array with default values. */ +for (i =0 ; i <CONFIG_BLK_DEV_RAM_COUNT ; i++) { + rd_sizes[i] =CONFIG_BLK_DEV_RAM_SIZE ; + } + } +for (i =0 ; i <CONFIG_BLK_DEV_RAM_COUNT ; i++) { rd_disks[i] =alloc_disk (1 );if (!rd_disks[i])
@@ -461,14 +504,14 @@ disk->flags |=GENHD_FL_SUPPRESS_PARTITION_INFO ;sprintf (disk->disk_name,"ram%d" , i);sprintf (disk->devfs_name,"rd/%d" , i); -set_capacity (disk, rd_size *2 ); +set_capacity (disk, rd_sizes[i] *2 );add_disk (rd_disks[i]); }/* rd_size is given in kB */ printk ("RAMDISK driver initialized: " -"%d RAM disks of %dK size %d blocksize\n" , -CONFIG_BLK_DEV_RAM_COUNT , rd_size, rd_blocksize); +"%d RAM disks with %d blocksize\n" , +CONFIG_BLK_DEV_RAM_COUNT , rd_blocksize);return 0 ; out_queue:
@@ -488,7 +531,7 @@#ifndef MODULE static int __init ramdisk_size (char *str) { - rd_size =simple_strtol (str,NULL ,0 ); + rd_size = str;return 1 ; }static int __init ramdisk_size2 (char *str)/* kludge */
@@ -506,8 +549,8 @@#endif /* options - modular */ -module_param (rd_size, int,0 ); -MODULE_PARM_DESC (rd_size,"Size of each RAM disk in kbytes." ); +module_param (rd_size, charp,0 ); +MODULE_PARM_DESC (rd_size,"Sizes of the RAM disks." );module_param (rd_blocksize, int,0 );MODULE_PARM_DESC (rd_blocksize,"Blocksize of each RAM disk in bytes." );MODULE_ALIAS_BLOCKDEV_MAJOR (RAMDISK_MAJOR );