Commit 890fbae2818a045350b8d1e3bda61ceb88ff1d17
1 parent
331b831983
Exists in
master
and in
4 other branches
[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: Greg Kroah-Hartman <gregkh@suse.de>
Showing 10 changed files with 18 additions and 52 deletions Side-by-side Diff
Documentation/Changes
... | ... | @@ -181,8 +181,8 @@ |
181 | 181 | -------------------- |
182 | 182 | |
183 | 183 | A driver has been added to allow updating of Intel IA32 microcode, |
184 | -accessible as both a devfs regular file and as a normal (misc) | |
185 | -character device. If you are not using devfs you may need to: | |
184 | +accessible as a normal (misc) character device. If you are not using | |
185 | +udev you may need to: | |
186 | 186 | |
187 | 187 | mkdir /dev/cpu |
188 | 188 | mknod /dev/cpu/microcode c 10 184 |
... | ... | @@ -201,7 +201,9 @@ |
201 | 201 | udev |
202 | 202 | ---- |
203 | 203 | udev is a userspace application for populating /dev dynamically with |
204 | -only entries for devices actually present. udev replaces devfs. | |
204 | +only entries for devices actually present. udev replaces the basic | |
205 | +functionality of devfs, while allowing persistant device naming for | |
206 | +devices. | |
205 | 207 | |
206 | 208 | FUSE |
207 | 209 | ---- |
208 | 210 | |
... | ... | @@ -231,17 +233,12 @@ |
231 | 233 | enable it to operate over diverse media layers. If you use PPP, |
232 | 234 | upgrade pppd to at least 2.4.0. |
233 | 235 | |
234 | -If you are not using devfs, you must have the device file /dev/ppp | |
236 | +If you are not using udev, you must have the device file /dev/ppp | |
235 | 237 | which can be made by: |
236 | 238 | |
237 | 239 | mknod /dev/ppp c 108 0 |
238 | 240 | |
239 | 241 | as root. |
240 | - | |
241 | -If you use devfsd and build ppp support as modules, you will need | |
242 | -the following in your /etc/devfsd.conf file: | |
243 | - | |
244 | -LOOKUP PPP MODLOAD | |
245 | 242 | |
246 | 243 | Isdn4k-utils |
247 | 244 | ------------ |
Documentation/DocBook/kernel-api.tmpl
... | ... | @@ -348,11 +348,6 @@ |
348 | 348 | </sect1> |
349 | 349 | </chapter> |
350 | 350 | |
351 | - <chapter id="devfs"> | |
352 | - <title>The Device File System</title> | |
353 | -!Efs/devfs/base.c | |
354 | - </chapter> | |
355 | - | |
356 | 351 | <chapter id="sysfs"> |
357 | 352 | <title>The Filesystem for Exporting Kernel Objects</title> |
358 | 353 | !Efs/sysfs/file.c |
Documentation/README.DAC960
... | ... | @@ -78,9 +78,9 @@ |
78 | 78 | terms are in use in the Mylex documentation; I have chosen to standardize on |
79 | 79 | the more generic "Logical Drive" and "Drive Group". |
80 | 80 | |
81 | -DAC960 RAID disk devices are named in the style of the Device File System | |
82 | -(DEVFS). The device corresponding to Logical Drive D on Controller C is | |
83 | -referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1 | |
81 | +DAC960 RAID disk devices are named in the style of the obsolete Device File | |
82 | +System (DEVFS). The device corresponding to Logical Drive D on Controller C | |
83 | +is referred to as /dev/rd/cCdD, and the partitions are called /dev/rd/cCdDp1 | |
84 | 84 | through /dev/rd/cCdDp7. For example, partition 3 of Logical Drive 5 on |
85 | 85 | Controller 2 is referred to as /dev/rd/c2d5p3. Note that unlike with SCSI |
86 | 86 | disks the device names will not change in the event of a disk drive failure. |
Documentation/initrd.txt
... | ... | @@ -67,8 +67,7 @@ |
67 | 67 | as the last process has closed it, all data is freed and /dev/initrd |
68 | 68 | can't be opened anymore. |
69 | 69 | |
70 | - root=/dev/ram0 (without devfs) | |
71 | - root=/dev/rd/0 (with devfs) | |
70 | + root=/dev/ram0 | |
72 | 71 | |
73 | 72 | initrd is mounted as root, and the normal boot procedure is followed, |
74 | 73 | with the RAM disk still mounted as root. |
... | ... | @@ -90,8 +89,7 @@ |
90 | 89 | procedure should create the /initrd directory. |
91 | 90 | |
92 | 91 | If initrd will not be mounted in some cases, its content is still |
93 | -accessible if the following device has been created (note that this | |
94 | -does not work if using devfs): | |
92 | +accessible if the following device has been created: | |
95 | 93 | |
96 | 94 | # mknod /dev/initrd b 1 250 |
97 | 95 | # chmod 400 /dev/initrd |
... | ... | @@ -119,8 +117,7 @@ |
119 | 117 | (if space is critical, you may want to use the Minix FS instead of Ext2) |
120 | 118 | 3) mount the file system, e.g. |
121 | 119 | # mount -t ext2 -o loop initrd /mnt |
122 | - 4) create the console device (not necessary if using devfs, but it can't | |
123 | - hurt to do it anyway): | |
120 | + 4) create the console device: | |
124 | 121 | # mkdir /mnt/dev |
125 | 122 | # mknod /mnt/dev/console c 5 1 |
126 | 123 | 5) copy all the files that are needed to properly use the initrd |
127 | 124 | |
... | ... | @@ -152,13 +149,8 @@ |
152 | 149 | |
153 | 150 | root=/dev/ram0 init=/linuxrc rw |
154 | 151 | |
155 | -if not using devfs, or | |
152 | +(rw is only necessary if writing to the initrd file system.) | |
156 | 153 | |
157 | - root=/dev/rd/0 init=/linuxrc rw | |
158 | - | |
159 | -if using devfs. (rw is only necessary if writing to the initrd file | |
160 | -system.) | |
161 | - | |
162 | 154 | With LOADLIN, you simply execute |
163 | 155 | |
164 | 156 | LOADLIN <kernel> initrd=<disk_image> |
... | ... | @@ -217,9 +209,9 @@ |
217 | 209 | # exec chroot . what-follows <dev/console >dev/console 2>&1 |
218 | 210 | |
219 | 211 | Where what-follows is a program under the new root, e.g. /sbin/init |
220 | -If the new root file system will be used with devfs and has no valid | |
221 | -/dev directory, devfs must be mounted before invoking chroot in order to | |
222 | -provide /dev/console. | |
212 | +If the new root file system will be used with udev and has no valid | |
213 | +/dev directory, udev must be initialized before invoking chroot in order | |
214 | +to provide /dev/console. | |
223 | 215 | |
224 | 216 | Note: implementation details of pivot_root may change with time. In order |
225 | 217 | to ensure compatibility, the following points should be observed: |
... | ... | @@ -236,7 +228,7 @@ |
236 | 228 | disk can be freed: |
237 | 229 | |
238 | 230 | # umount /initrd |
239 | -# blockdev --flushbufs /dev/ram0 # /dev/rd/0 if using devfs | |
231 | +# blockdev --flushbufs /dev/ram0 | |
240 | 232 | |
241 | 233 | It is also possible to use initrd with an NFS-mounted root, see the |
242 | 234 | pivot_root(8) man page for details. |
Documentation/ioctl-number.txt
... | ... | @@ -119,7 +119,6 @@ |
119 | 119 | 'c' 00-7F linux/comstats.h conflict! |
120 | 120 | 'c' 00-7F linux/coda.h conflict! |
121 | 121 | 'd' 00-FF linux/char/drm/drm/h conflict! |
122 | -'d' 00-1F linux/devfs_fs.h conflict! | |
123 | 122 | 'd' 00-DF linux/video_decoder.h conflict! |
124 | 123 | 'd' F0-FF linux/digi1.h |
125 | 124 | 'e' all linux/digi1.h conflict! |
Documentation/kernel-parameters.txt
... | ... | @@ -35,7 +35,6 @@ |
35 | 35 | APM Advanced Power Management support is enabled. |
36 | 36 | AX25 Appropriate AX.25 support is enabled. |
37 | 37 | CD Appropriate CD support is enabled. |
38 | - DEVFS devfs support is enabled. | |
39 | 38 | DRM Direct Rendering Management support is enabled. |
40 | 39 | EDD BIOS Enhanced Disk Drive Services (EDD) is enabled |
41 | 40 | EFI EFI Partitioning (GPT) is enabled |
... | ... | @@ -439,9 +438,6 @@ |
439 | 438 | decnet= [HW,NET] |
440 | 439 | Format: <area>[,<node>] |
441 | 440 | See also Documentation/networking/decnet.txt. |
442 | - | |
443 | - devfs= [DEVFS] | |
444 | - See Documentation/filesystems/devfs/boot-options. | |
445 | 441 | |
446 | 442 | dhash_entries= [KNL] |
447 | 443 | Set number of hash buckets for dentry cache. |
drivers/block/viodasd.c
drivers/cdrom/viocd.c
drivers/md/dm.c
drivers/media/dvb/ttusb-budget/dvb-ttusb-budget.c
... | ... | @@ -126,10 +126,6 @@ |
126 | 126 | |
127 | 127 | int revision; |
128 | 128 | |
129 | -#if 0 | |
130 | - devfs_handle_t stc_devfs_handle; | |
131 | -#endif | |
132 | - | |
133 | 129 | struct dvb_frontend* fe; |
134 | 130 | }; |
135 | 131 | |
... | ... | @@ -1746,13 +1742,6 @@ |
1746 | 1742 | return -ENODEV; |
1747 | 1743 | } |
1748 | 1744 | |
1749 | -#if 0 | |
1750 | - ttusb->stc_devfs_handle = | |
1751 | - devfs_register(ttusb->adapter->devfs_handle, TTUSB_BUDGET_NAME, | |
1752 | - DEVFS_FL_DEFAULT, 0, 192, | |
1753 | - S_IFCHR | S_IRUSR | S_IWUSR | S_IRGRP | S_IWGRP | |
1754 | - | S_IROTH | S_IWOTH, &stc_fops, ttusb); | |
1755 | -#endif | |
1756 | 1745 | usb_set_intfdata(intf, (void *) ttusb); |
1757 | 1746 | |
1758 | 1747 | frontend_init(ttusb); |