提交 890fbae2 编写于 作者: G Greg Kroah-Hartman

[PATCH] devfs: Last little devfs cleanups throughout the kernel tree.

Just removes a few unused #defines and fixes some comments due to
devfs now being gone.
Signed-off-by: NGreg Kroah-Hartman <gregkh@suse.de>
上级 331b8319
...@@ -181,8 +181,8 @@ Intel IA32 microcode ...@@ -181,8 +181,8 @@ Intel IA32 microcode
-------------------- --------------------
A driver has been added to allow updating of Intel IA32 microcode, A driver has been added to allow updating of Intel IA32 microcode,
accessible as both a devfs regular file and as a normal (misc) accessible as a normal (misc) character device. If you are not using
character device. If you are not using devfs you may need to: udev you may need to:
mkdir /dev/cpu mkdir /dev/cpu
mknod /dev/cpu/microcode c 10 184 mknod /dev/cpu/microcode c 10 184
...@@ -201,7 +201,9 @@ with programs using shared memory. ...@@ -201,7 +201,9 @@ with programs using shared memory.
udev udev
---- ----
udev is a userspace application for populating /dev dynamically with udev is a userspace application for populating /dev dynamically with
only entries for devices actually present. udev replaces devfs. only entries for devices actually present. udev replaces the basic
functionality of devfs, while allowing persistant device naming for
devices.
FUSE FUSE
---- ----
...@@ -231,18 +233,13 @@ The PPP driver has been restructured to support multilink and to ...@@ -231,18 +233,13 @@ The PPP driver has been restructured to support multilink and to
enable it to operate over diverse media layers. If you use PPP, enable it to operate over diverse media layers. If you use PPP,
upgrade pppd to at least 2.4.0. upgrade pppd to at least 2.4.0.
If you are not using devfs, you must have the device file /dev/ppp If you are not using udev, you must have the device file /dev/ppp
which can be made by: which can be made by:
mknod /dev/ppp c 108 0 mknod /dev/ppp c 108 0
as root. as root.
If you use devfsd and build ppp support as modules, you will need
the following in your /etc/devfsd.conf file:
LOOKUP PPP MODLOAD
Isdn4k-utils Isdn4k-utils
------------ ------------
......
...@@ -348,11 +348,6 @@ X!Earch/i386/kernel/mca.c ...@@ -348,11 +348,6 @@ X!Earch/i386/kernel/mca.c
</sect1> </sect1>
</chapter> </chapter>
<chapter id="devfs">
<title>The Device File System</title>
!Efs/devfs/base.c
</chapter>
<chapter id="sysfs"> <chapter id="sysfs">
<title>The Filesystem for Exporting Kernel Objects</title> <title>The Filesystem for Exporting Kernel Objects</title>
!Efs/sysfs/file.c !Efs/sysfs/file.c
......
...@@ -78,9 +78,9 @@ also known as "System Drives", and Drive Groups are also called "Packs". Both ...@@ -78,9 +78,9 @@ also known as "System Drives", and Drive Groups are also called "Packs". Both
terms are in use in the Mylex documentation; I have chosen to standardize on terms are in use in the Mylex documentation; I have chosen to standardize on
the more generic "Logical Drive" and "Drive Group". the more generic "Logical Drive" and "Drive Group".
DAC960 RAID disk devices are named in the style of the Device File System DAC960 RAID disk devices are named in the style of the obsolete Device File
(DEVFS). The device corresponding to Logical Drive D on Controller C is System (DEVFS). The device corresponding to Logical Drive D on Controller C
referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1 is referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1
through /dev/rd/cCdDp7. For example, partition 3 of Logical Drive 5 on through /dev/rd/cCdDp7. For example, partition 3 of Logical Drive 5 on
Controller 2 is referred to as /dev/rd/c2d5p3. Note that unlike with SCSI Controller 2 is referred to as /dev/rd/c2d5p3. Note that unlike with SCSI
disks the device names will not change in the event of a disk drive failure. disks the device names will not change in the event of a disk drive failure.
......
...@@ -67,8 +67,7 @@ initrd adds the following new options: ...@@ -67,8 +67,7 @@ initrd adds the following new options:
as the last process has closed it, all data is freed and /dev/initrd as the last process has closed it, all data is freed and /dev/initrd
can't be opened anymore. can't be opened anymore.
root=/dev/ram0 (without devfs) root=/dev/ram0
root=/dev/rd/0 (with devfs)
initrd is mounted as root, and the normal boot procedure is followed, initrd is mounted as root, and the normal boot procedure is followed,
with the RAM disk still mounted as root. with the RAM disk still mounted as root.
...@@ -90,8 +89,7 @@ you're building an install floppy), the root file system creation ...@@ -90,8 +89,7 @@ you're building an install floppy), the root file system creation
procedure should create the /initrd directory. procedure should create the /initrd directory.
If initrd will not be mounted in some cases, its content is still If initrd will not be mounted in some cases, its content is still
accessible if the following device has been created (note that this accessible if the following device has been created:
does not work if using devfs):
# mknod /dev/initrd b 1 250 # mknod /dev/initrd b 1 250
# chmod 400 /dev/initrd # chmod 400 /dev/initrd
...@@ -119,8 +117,7 @@ We'll describe the loopback device method: ...@@ -119,8 +117,7 @@ We'll describe the loopback device method:
(if space is critical, you may want to use the Minix FS instead of Ext2) (if space is critical, you may want to use the Minix FS instead of Ext2)
3) mount the file system, e.g. 3) mount the file system, e.g.
# mount -t ext2 -o loop initrd /mnt # mount -t ext2 -o loop initrd /mnt
4) create the console device (not necessary if using devfs, but it can't 4) create the console device:
hurt to do it anyway):
# mkdir /mnt/dev # mkdir /mnt/dev
# mknod /mnt/dev/console c 5 1 # mknod /mnt/dev/console c 5 1
5) copy all the files that are needed to properly use the initrd 5) copy all the files that are needed to properly use the initrd
...@@ -152,12 +149,7 @@ have to be given: ...@@ -152,12 +149,7 @@ have to be given:
root=/dev/ram0 init=/linuxrc rw root=/dev/ram0 init=/linuxrc rw
if not using devfs, or (rw is only necessary if writing to the initrd file system.)
root=/dev/rd/0 init=/linuxrc rw
if using devfs. (rw is only necessary if writing to the initrd file
system.)
With LOADLIN, you simply execute With LOADLIN, you simply execute
...@@ -217,9 +209,9 @@ following command: ...@@ -217,9 +209,9 @@ following command:
# exec chroot . what-follows <dev/console >dev/console 2>&1 # exec chroot . what-follows <dev/console >dev/console 2>&1
Where what-follows is a program under the new root, e.g. /sbin/init Where what-follows is a program under the new root, e.g. /sbin/init
If the new root file system will be used with devfs and has no valid If the new root file system will be used with udev and has no valid
/dev directory, devfs must be mounted before invoking chroot in order to /dev directory, udev must be initialized before invoking chroot in order
provide /dev/console. to provide /dev/console.
Note: implementation details of pivot_root may change with time. In order Note: implementation details of pivot_root may change with time. In order
to ensure compatibility, the following points should be observed: to ensure compatibility, the following points should be observed:
...@@ -236,7 +228,7 @@ Now, the initrd can be unmounted and the memory allocated by the RAM ...@@ -236,7 +228,7 @@ Now, the initrd can be unmounted and the memory allocated by the RAM
disk can be freed: disk can be freed:
# umount /initrd # umount /initrd
# blockdev --flushbufs /dev/ram0 # /dev/rd/0 if using devfs # blockdev --flushbufs /dev/ram0
It is also possible to use initrd with an NFS-mounted root, see the It is also possible to use initrd with an NFS-mounted root, see the
pivot_root(8) man page for details. pivot_root(8) man page for details.
......
...@@ -119,7 +119,6 @@ Code Seq# Include File Comments ...@@ -119,7 +119,6 @@ Code Seq# Include File Comments
'c' 00-7F linux/comstats.h conflict! 'c' 00-7F linux/comstats.h conflict!
'c' 00-7F linux/coda.h conflict! 'c' 00-7F linux/coda.h conflict!
'd' 00-FF linux/char/drm/drm/h conflict! 'd' 00-FF linux/char/drm/drm/h conflict!
'd' 00-1F linux/devfs_fs.h conflict!
'd' 00-DF linux/video_decoder.h conflict! 'd' 00-DF linux/video_decoder.h conflict!
'd' F0-FF linux/digi1.h 'd' F0-FF linux/digi1.h
'e' all linux/digi1.h conflict! 'e' all linux/digi1.h conflict!
......
...@@ -35,7 +35,6 @@ parameter is applicable: ...@@ -35,7 +35,6 @@ parameter is applicable:
APM Advanced Power Management support is enabled. APM Advanced Power Management support is enabled.
AX25 Appropriate AX.25 support is enabled. AX25 Appropriate AX.25 support is enabled.
CD Appropriate CD support is enabled. CD Appropriate CD support is enabled.
DEVFS devfs support is enabled.
DRM Direct Rendering Management support is enabled. DRM Direct Rendering Management support is enabled.
EDD BIOS Enhanced Disk Drive Services (EDD) is enabled EDD BIOS Enhanced Disk Drive Services (EDD) is enabled
EFI EFI Partitioning (GPT) is enabled EFI EFI Partitioning (GPT) is enabled
...@@ -440,9 +439,6 @@ running once the system is up. ...@@ -440,9 +439,6 @@ running once the system is up.
Format: <area>[,<node>] Format: <area>[,<node>]
See also Documentation/networking/decnet.txt. See also Documentation/networking/decnet.txt.
devfs= [DEVFS]
See Documentation/filesystems/devfs/boot-options.
dhash_entries= [KNL] dhash_entries= [KNL]
Set number of hash buckets for dentry cache. Set number of hash buckets for dentry cache.
......
...@@ -59,7 +59,6 @@ MODULE_LICENSE("GPL"); ...@@ -59,7 +59,6 @@ MODULE_LICENSE("GPL");
* numbers 0-255 we get a maximum of 32 disks. * numbers 0-255 we get a maximum of 32 disks.
*/ */
#define VIOD_GENHD_NAME "iseries/vd" #define VIOD_GENHD_NAME "iseries/vd"
#define VIOD_GENHD_DEVFS_NAME "iseries/disc"
#define VIOD_VERS "1.64" #define VIOD_VERS "1.64"
......
...@@ -49,7 +49,6 @@ ...@@ -49,7 +49,6 @@
#include <asm/iseries/vio.h> #include <asm/iseries/vio.h>
#define VIOCD_DEVICE "iseries/vcd" #define VIOCD_DEVICE "iseries/vcd"
#define VIOCD_DEVICE_DEVFS "iseries/vcd"
#define VIOCD_VERS "1.06" #define VIOCD_VERS "1.06"
......
...@@ -167,7 +167,7 @@ static void local_exit(void) ...@@ -167,7 +167,7 @@ static void local_exit(void)
bioset_free(dm_set); bioset_free(dm_set);
if (unregister_blkdev(_major, _name) < 0) if (unregister_blkdev(_major, _name) < 0)
DMERR("devfs_unregister_blkdev failed"); DMERR("unregister_blkdev failed");
_major = 0; _major = 0;
......
...@@ -126,10 +126,6 @@ struct ttusb { ...@@ -126,10 +126,6 @@ struct ttusb {
int revision; int revision;
#if 0
devfs_handle_t stc_devfs_handle;
#endif
struct dvb_frontend* fe; struct dvb_frontend* fe;
}; };
...@@ -1746,13 +1742,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i ...@@ -1746,13 +1742,6 @@ static int ttusb_probe(struct usb_interface *intf, const struct usb_device_id *i
return -ENODEV; return -ENODEV;
} }
#if 0
ttusb->stc_devfs_handle =
devfs_register(ttusb->adapter->devfs_handle, TTUSB_BUDGET_NAME,
DEVFS_FL_DEFAULT, 0, 192,
S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP
| S_IROTH | S_IWOTH, &stc_fops, ttusb);
#endif
usb_set_intfdata(intf, (void *) ttusb); usb_set_intfdata(intf, (void *) ttusb);
frontend_init(ttusb); frontend_init(ttusb);
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册