This patch updates UML to 2.5.62 and merges in the changes pending in the 2.4
UML pool.
Among the changes:
More help entries in the config
Build fixes, updates, and cleanups
ubd driver cleanups and fixes
uaccess fencepost fix
The 2.5.62-1 UML patch is available at
http://uml-pub.ists.dartmouth.edu/uml/uml-patch-2.5.62-1.bz2
For the other UML mirrors and other downloads, see
http://user-mode-linux.sourceforge.net/dl-sf.html
Other links of interest:
The UML project home page : http://user-mode-linux.sourceforge.net
The UML Community site : http://usermodelinux.org
Jeff
Hello!
On Wed, Feb 19, 2003 at 03:08:08PM -0500, Jeff Dike wrote:
> ubd driver cleanups and fixes
Ah, great. Except it introduced new breakage.
That hunk below from your diff adds add_disk() call.
Notice how a bit down we have another call to add_disk(),
that is not removed. So we end up woth two add_disk() calls.
Of course sysfs gets upset immediately (probably not only it).
diff -Naur a/arch/um/drivers/ubd_kern.c b/arch/um/drivers/ubd_kern.c
--- a/arch/um/drivers/ubd_kern.c Wed Feb 19 11:24:39 2003
+++ b/arch/um/drivers/ubd_kern.c Wed Feb 19 11:29:49 2003
@@ -499,17 +516,22 @@
disk->major = major;
disk->first_minor = minor;
disk->fops = &ubd_blops;
+ disk->private_data = dev;
+ disk->queue = &ubd_queue;
set_capacity(disk, size / 512);
- /* needs to be ubd -> /dev/ubd/discX/disc */
- sprintf(disk->disk_name, "ubd");
+ sprintf(disk->disk_name, name);
*disk_out = disk;
+ add_disk(disk);
- /* /dev/ubd/N style names */
- sprintf(devfs_name, "%d", unit);
- *handle_out = devfs_register(dir_handle, devfs_name,
- DEVFS_FL_REMOVABLE, major, minor,
- S_IFBLK | S_IRUSR | S_IWUSR | S_IRGRP |
- S_IWGRP, &ubd_blops, NULL);
+ if(handle_out != NULL){
+ /* /dev/ubd/N style names */
+ sprintf(devfs_name, "%d", unit);
+ *handle_out = devfs_register(dir_handle, devfs_name,
+ DEVFS_FL_DEFAULT, major, minor,
+ S_IFBLK | S_IRUSR | S_IWUSR |
+ S_IRGRP | S_IWGRP, &ubd_blops,
+ NULL);
+ }
disk->private_data = &ubd_dev[unit];
disk->queue = &ubd_queue;
add_disk(disk);
Bye,
Oleg
[email protected] said:
> That hunk below from your diff adds add_disk() call. Notice how a bit
> down we have another call to add_disk(), that is not removed. So we
> end up woth two add_disk() calls. Of course sysfs gets upset
> immediately (probably not only it).
Oops, fixed.
Jeff