Commit 25fad945a7f7ff2cf06e437381c6a1121784dbd9
Committed by
Linus Torvalds
Linus Torvalds
1 parent
e6ee512f5a
Exists in
master
and in
4 other branches
fs menu: small reorg
- move minixfs and ROMfs to the Miscellaneous filesystems menu - move DNOTIFY config symbol so that it is adjacent to INOTIFY instead of being split by the QUOTA config options - add some 'endif' annotations - remove some whitespace (extra blank lines) Signed-off-by: Randy Dunlap <randy.dunlap@oracle.com> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
Showing 1 changed file with 46 additions and 47 deletions Side-by-side Diff
fs/Kconfig
| ... | ... | @@ -463,41 +463,19 @@ |
| 463 | 463 | this option for debugging only as it is likely to decrease |
| 464 | 464 | performance of the filesystem. |
| 465 | 465 | |
| 466 | -config MINIX_FS | |
| 467 | - tristate "Minix fs support" | |
| 466 | +endif # BLOCK | |
| 467 | + | |
| 468 | +config DNOTIFY | |
| 469 | + bool "Dnotify support" | |
| 470 | + default y | |
| 468 | 471 | help |
| 469 | - Minix is a simple operating system used in many classes about OS's. | |
| 470 | - The minix file system (method to organize files on a hard disk | |
| 471 | - partition or a floppy disk) was the original file system for Linux, | |
| 472 | - but has been superseded by the second extended file system ext2fs. | |
| 473 | - You don't want to use the minix file system on your hard disk | |
| 474 | - because of certain built-in restrictions, but it is sometimes found | |
| 475 | - on older Linux floppy disks. This option will enlarge your kernel | |
| 476 | - by about 28 KB. If unsure, say N. | |
| 472 | + Dnotify is a directory-based per-fd file change notification system | |
| 473 | + that uses signals to communicate events to user-space. There exist | |
| 474 | + superior alternatives, but some applications may still rely on | |
| 475 | + dnotify. | |
| 477 | 476 | |
| 478 | - To compile this file system support as a module, choose M here: the | |
| 479 | - module will be called minix. Note that the file system of your root | |
| 480 | - partition (the one containing the directory /) cannot be compiled as | |
| 481 | - a module. | |
| 477 | + If unsure, say Y. | |
| 482 | 478 | |
| 483 | -config ROMFS_FS | |
| 484 | - tristate "ROM file system support" | |
| 485 | - ---help--- | |
| 486 | - This is a very small read-only file system mainly intended for | |
| 487 | - initial ram disks of installation disks, but it could be used for | |
| 488 | - other read-only media as well. Read | |
| 489 | - <file:Documentation/filesystems/romfs.txt> for details. | |
| 490 | - | |
| 491 | - To compile this file system support as a module, choose M here: the | |
| 492 | - module will be called romfs. Note that the file system of your | |
| 493 | - root partition (the one containing the directory /) cannot be a | |
| 494 | - module. | |
| 495 | - | |
| 496 | - If you don't know whether you need it, then you don't need it: | |
| 497 | - answer N. | |
| 498 | - | |
| 499 | -endif | |
| 500 | - | |
| 501 | 479 | config INOTIFY |
| 502 | 480 | bool "Inotify file change notification support" |
| 503 | 481 | default y |
| ... | ... | @@ -577,17 +555,6 @@ |
| 577 | 555 | depends on XFS_QUOTA || QUOTA |
| 578 | 556 | default y |
| 579 | 557 | |
| 580 | -config DNOTIFY | |
| 581 | - bool "Dnotify support" | |
| 582 | - default y | |
| 583 | - help | |
| 584 | - Dnotify is a directory-based per-fd file change notification system | |
| 585 | - that uses signals to communicate events to user-space. There exist | |
| 586 | - superior alternatives, but some applications may still rely on | |
| 587 | - dnotify. | |
| 588 | - | |
| 589 | - If unsure, say Y. | |
| 590 | - | |
| 591 | 558 | config AUTOFS_FS |
| 592 | 559 | tristate "Kernel automounter support" |
| 593 | 560 | help |
| ... | ... | @@ -713,7 +680,7 @@ |
| 713 | 680 | depends on (UDF_FS=m && NLS) || (UDF_FS=y && NLS=y) |
| 714 | 681 | |
| 715 | 682 | endmenu |
| 716 | -endif | |
| 683 | +endif # BLOCK | |
| 717 | 684 | |
| 718 | 685 | if BLOCK |
| 719 | 686 | menu "DOS/FAT/NT Filesystems" |
| ... | ... | @@ -896,7 +863,7 @@ |
| 896 | 863 | It is perfectly safe to say N here. |
| 897 | 864 | |
| 898 | 865 | endmenu |
| 899 | -endif | |
| 866 | +endif # BLOCK | |
| 900 | 867 | |
| 901 | 868 | menu "Pseudo filesystems" |
| 902 | 869 | |
| 903 | 870 | |
| ... | ... | @@ -1417,7 +1384,25 @@ |
| 1417 | 1384 | To compile this as a module, choose M here: the module will be |
| 1418 | 1385 | called freevxfs. If unsure, say N. |
| 1419 | 1386 | |
| 1387 | +config MINIX_FS | |
| 1388 | + tristate "Minix file system support" | |
| 1389 | + depends on BLOCK | |
| 1390 | + help | |
| 1391 | + Minix is a simple operating system used in many classes about OS's. | |
| 1392 | + The minix file system (method to organize files on a hard disk | |
| 1393 | + partition or a floppy disk) was the original file system for Linux, | |
| 1394 | + but has been superseded by the second extended file system ext2fs. | |
| 1395 | + You don't want to use the minix file system on your hard disk | |
| 1396 | + because of certain built-in restrictions, but it is sometimes found | |
| 1397 | + on older Linux floppy disks. This option will enlarge your kernel | |
| 1398 | + by about 28 KB. If unsure, say N. | |
| 1420 | 1399 | |
| 1400 | + To compile this file system support as a module, choose M here: the | |
| 1401 | + module will be called minix. Note that the file system of your root | |
| 1402 | + partition (the one containing the directory /) cannot be compiled as | |
| 1403 | + a module. | |
| 1404 | + | |
| 1405 | + | |
| 1421 | 1406 | config HPFS_FS |
| 1422 | 1407 | tristate "OS/2 HPFS file system support" |
| 1423 | 1408 | depends on BLOCK |
| ... | ... | @@ -1434,7 +1419,6 @@ |
| 1434 | 1419 | module will be called hpfs. If unsure, say N. |
| 1435 | 1420 | |
| 1436 | 1421 | |
| 1437 | - | |
| 1438 | 1422 | config QNX4FS_FS |
| 1439 | 1423 | tristate "QNX4 file system support (read only)" |
| 1440 | 1424 | depends on BLOCK |
| 1441 | 1425 | |
| 1442 | 1426 | |
| ... | ... | @@ -1461,8 +1445,24 @@ |
| 1461 | 1445 | It's currently broken, so for now: |
| 1462 | 1446 | answer N. |
| 1463 | 1447 | |
| 1448 | +config ROMFS_FS | |
| 1449 | + tristate "ROM file system support" | |
| 1450 | + depends on BLOCK | |
| 1451 | + ---help--- | |
| 1452 | + This is a very small read-only file system mainly intended for | |
| 1453 | + initial ram disks of installation disks, but it could be used for | |
| 1454 | + other read-only media as well. Read | |
| 1455 | + <file:Documentation/filesystems/romfs.txt> for details. | |
| 1464 | 1456 | |
| 1457 | + To compile this file system support as a module, choose M here: the | |
| 1458 | + module will be called romfs. Note that the file system of your | |
| 1459 | + root partition (the one containing the directory /) cannot be a | |
| 1460 | + module. | |
| 1465 | 1461 | |
| 1462 | + If you don't know whether you need it, then you don't need it: | |
| 1463 | + answer N. | |
| 1464 | + | |
| 1465 | + | |
| 1466 | 1466 | config SYSV_FS |
| 1467 | 1467 | tristate "System V/Xenix/V7/Coherent file system support" |
| 1468 | 1468 | depends on BLOCK |
| ... | ... | @@ -1499,7 +1499,6 @@ |
| 1499 | 1499 | sysv. |
| 1500 | 1500 | |
| 1501 | 1501 | If you haven't heard about all of this before, it's safe to say N. |
| 1502 | - | |
| 1503 | 1502 | |
| 1504 | 1503 | |
| 1505 | 1504 | config UFS_FS |