remove DEVFS_FL_REMOVABLE
PATCH 1/1 remove DEVFS_FL_REMOVABLE
devfs tries to be super smart and rereads partition tables at all kinds of wierd points. This breaks a bunch of stuff were you can't get the right disk changed information (i.e. CompactFlash).
If people actually needs this kind of stuff they should just call partx from devfsd instead of relying on the kernel doing something like this.
Cleans up the devfs code significatnly (i.e. removes tons of junk)
arch/um/drivers/ubd_kern.c +1 -1
@@ -507,7 +507,7 @@/* /dev/ubd/N style names */ sprintf (devfs_name,"%d" , unit); *handle_out =devfs_register (dir_handle, devfs_name, -DEVFS_FL_REMOVABLE , major, minor, +0 , major, minor,S_IFBLK |S_IRUSR |S_IWUSR |S_IRGRP |S_IWGRP , &ubd_blops,NULL ); disk->private_data = &ubd_dev[unit];
fs/devfs/base.c +10 -125
242 lines not on this page · raw message
===== fs/partitions/check.c 1.96 vs edited =====
fs/partitions/check.c +2 -8
@@ -156,7 +156,6 @@ {#ifdef CONFIG_DEVFS_FS devfs_handle_t dir; -unsigned int devfs_flags =DEVFS_FL_DEFAULT ;struct hd_struct *p = dev->part;char devname[16 ];
@@ -165,10 +164,8 @@ dir = dev->de;if (!dir)return ; -if (dev->flags &GENHD_FL_REMOVABLE ) - devfs_flags |=DEVFS_FL_REMOVABLE ;sprintf (devname,"part%d" , part); - p[part-1 ].de =devfs_register (dir, devname, devfs_flags, + p[part-1 ].de =devfs_register (dir, devname,0 , dev->major, dev->first_minor + part,S_IFBLK |S_IRUSR |S_IWUSR , dev->fops,NULL );
@@ -185,11 +182,8 @@#ifdef CONFIG_DEVFS_FS int pos =0 ;devfs_handle_t dir, slave; -unsigned int devfs_flags =DEVFS_FL_DEFAULT ;char dirname[64 ], symlink[16 ]; -if (dev->flags &GENHD_FL_REMOVABLE ) - devfs_flags |=DEVFS_FL_REMOVABLE ;if (dev->flags &GENHD_FL_DEVFS ) { dir = dev->de;if (!dir)/* Aware driver wants to block disc management */
@@ -209,7 +203,7 @@sprintf (symlink,"discs/disc%d" , dev->number);devfs_mk_symlink (NULL , symlink,DEVFS_FL_DEFAULT , dirname + pos, &slave,NULL ); - dev->disk_de =devfs_register (dir,"disc" , devfs_flags, + dev->disk_de =devfs_register (dir,"disc" ,0 , dev->major, dev->first_minor,S_IFBLK |S_IRUSR |S_IWUSR , dev->fops,NULL );#endif
include/linux/devfs_fs_kernel.h +0 -1
@@ -13,7 +13,6 @@#define DEVFS_FL_NONE 0x000/* This helps to make code more readable */ -#define DEVFS_FL_REMOVABLE 0x008/* This is a removable media device */ #define DEVFS_FL_WAIT 0x010/* Wait for devfsd to finish */ #define DEVFS_FL_CURRENT_OWNER 0x020/* Set initial ownership to current */ #define DEVFS_FL_DEFAULT DEVFS_FL_NONE