aboutsummaryrefslogtreecommitdiffstats
path: root/fs/Kconfig
diff options
context:
space:
mode:
authorTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-15 18:34:16 -0400
committerTrond Myklebust <Trond.Myklebust@netapp.com>2008-07-15 18:34:16 -0400
commite89e896d31b11a51a54ddcd3f72a76bd286dd86c (patch)
tree105a9a93a4021caeeba76e479778ad2dd2b87b57 /fs/Kconfig
parent3a628b0fd42f7eaf9d052447784d48ceae9ffb8e (diff)
parentd67d1c7bf948341fd8678c8e337ec27f4b46b206 (diff)
Merge branch 'devel' into next
Conflicts: fs/nfs/file.c Fix up the conflict with Jon Corbet's bkl-removal tree
Diffstat (limited to 'fs/Kconfig')
-rw-r--r--fs/Kconfig136
1 files changed, 57 insertions, 79 deletions
diff --git a/fs/Kconfig b/fs/Kconfig
index 313b2e06ded5..84ab76a206a0 100644
--- a/fs/Kconfig
+++ b/fs/Kconfig
@@ -1544,10 +1544,6 @@ config UFS_FS
1544 The recently released UFS2 variant (used in FreeBSD 5.x) is 1544 The recently released UFS2 variant (used in FreeBSD 5.x) is
1545 READ-ONLY supported. 1545 READ-ONLY supported.
1546 1546
1547 If you only intend to mount files from some other Unix over the
1548 network using NFS, you don't need the UFS file system support (but
1549 you need NFS file system support obviously).
1550
1551 Note that this option is generally not needed for floppies, since a 1547 Note that this option is generally not needed for floppies, since a
1552 good portable way to transport files and directories between unixes 1548 good portable way to transport files and directories between unixes
1553 (and even other operating systems) is given by the tar program ("man 1549 (and even other operating systems) is given by the tar program ("man
@@ -1587,6 +1583,7 @@ menuconfig NETWORK_FILESYSTEMS
1587 Say Y here to get to see options for network filesystems and 1583 Say Y here to get to see options for network filesystems and
1588 filesystem-related networking code, such as NFS daemon and 1584 filesystem-related networking code, such as NFS daemon and
1589 RPCSEC security modules. 1585 RPCSEC security modules.
1586
1590 This option alone does not add any kernel code. 1587 This option alone does not add any kernel code.
1591 1588
1592 If you say N, all options in this submenu will be skipped and 1589 If you say N, all options in this submenu will be skipped and
@@ -1595,76 +1592,92 @@ menuconfig NETWORK_FILESYSTEMS
1595if NETWORK_FILESYSTEMS 1592if NETWORK_FILESYSTEMS
1596 1593
1597config NFS_FS 1594config NFS_FS
1598 tristate "NFS file system support" 1595 tristate "NFS client support"
1599 depends on INET 1596 depends on INET
1600 select LOCKD 1597 select LOCKD
1601 select SUNRPC 1598 select SUNRPC
1602 select NFS_ACL_SUPPORT if NFS_V3_ACL 1599 select NFS_ACL_SUPPORT if NFS_V3_ACL
1603 help 1600 help
1604 If you are connected to some other (usually local) Unix computer 1601 Choose Y here if you want to access files residing on other
1605 (using SLIP, PLIP, PPP or Ethernet) and want to mount files residing 1602 computers using Sun's Network File System protocol. To compile
1606 on that computer (the NFS server) using the Network File Sharing 1603 this file system support as a module, choose M here: the module
1607 protocol, say Y. "Mounting files" means that the client can access 1604 will be called nfs.
1608 the files with usual UNIX commands as if they were sitting on the
1609 client's hard disk. For this to work, the server must run the
1610 programs nfsd and mountd (but does not need to have NFS file system
1611 support enabled in its kernel). NFS is explained in the Network
1612 Administrator's Guide, available from
1613 <http://www.tldp.org/docs.html#guide>, on its man page: "man
1614 nfs", and in the NFS-HOWTO.
1615
1616 A superior but less widely used alternative to NFS is provided by
1617 the Coda file system; see "Coda file system support" below.
1618 1605
1619 If you say Y here, you should have said Y to TCP/IP networking also. 1606 To mount file systems exported by NFS servers, you also need to
1620 This option would enlarge your kernel by about 27 KB. 1607 install the user space mount.nfs command which can be found in
1608 the Linux nfs-utils package, available from http://linux-nfs.org/.
1609 Information about using the mount command is available in the
1610 mount(8) man page. More detail about the Linux NFS client
1611 implementation is available via the nfs(5) man page.
1621 1612
1622 To compile this file system support as a module, choose M here: the 1613 Below you can choose which versions of the NFS protocol are
1623 module will be called nfs. 1614 available in the kernel to mount NFS servers. Support for NFS
1615 version 2 (RFC 1094) is always available when NFS_FS is selected.
1624 1616
1625 If you are configuring a diskless machine which will mount its root 1617 To configure a system which mounts its root file system via NFS
1626 file system over NFS at boot time, say Y here and to "Kernel 1618 at boot time, say Y here, select "Kernel level IP
1627 level IP autoconfiguration" above and to "Root file system on NFS" 1619 autoconfiguration" in the NETWORK menu, and select "Root file
1628 below. You cannot compile this driver as a module in this case. 1620 system on NFS" below. You cannot compile this file system as a
1629 There are two packages designed for booting diskless machines over 1621 module in this case.
1630 the net: netboot, available from
1631 <http://ftp1.sourceforge.net/netboot/>, and Etherboot,
1632 available from <http://ftp1.sourceforge.net/etherboot/>.
1633 1622
1634 If you don't know what all this is about, say N. 1623 If unsure, say N.
1635 1624
1636config NFS_V3 1625config NFS_V3
1637 bool "Provide NFSv3 client support" 1626 bool "NFS client support for NFS version 3"
1638 depends on NFS_FS 1627 depends on NFS_FS
1639 help 1628 help
1640 Say Y here if you want your NFS client to be able to speak version 1629 This option enables support for version 3 of the NFS protocol
1641 3 of the NFS protocol. 1630 (RFC 1813) in the kernel's NFS client.
1642 1631
1643 If unsure, say Y. 1632 If unsure, say Y.
1644 1633
1645config NFS_V3_ACL 1634config NFS_V3_ACL
1646 bool "Provide client support for the NFSv3 ACL protocol extension" 1635 bool "NFS client support for the NFSv3 ACL protocol extension"
1647 depends on NFS_V3 1636 depends on NFS_V3
1648 help 1637 help
1649 Implement the NFSv3 ACL protocol extension for manipulating POSIX 1638 Some NFS servers support an auxiliary NFSv3 ACL protocol that
1650 Access Control Lists. The server should also be compiled with 1639 Sun added to Solaris but never became an official part of the
1651 the NFSv3 ACL protocol extension; see the CONFIG_NFSD_V3_ACL option. 1640 NFS version 3 protocol. This protocol extension allows
1641 applications on NFS clients to manipulate POSIX Access Control
1642 Lists on files residing on NFS servers. NFS servers enforce
1643 ACLs on local files whether this protocol is available or not.
1644
1645 Choose Y here if your NFS server supports the Solaris NFSv3 ACL
1646 protocol extension and you want your NFS client to allow
1647 applications to access and modify ACLs on files on the server.
1648
1649 Most NFS servers don't support the Solaris NFSv3 ACL protocol
1650 extension. You can choose N here or specify the "noacl" mount
1651 option to prevent your NFS client from trying to use the NFSv3
1652 ACL protocol.
1652 1653
1653 If unsure, say N. 1654 If unsure, say N.
1654 1655
1655config NFS_V4 1656config NFS_V4
1656 bool "Provide NFSv4 client support (EXPERIMENTAL)" 1657 bool "NFS client support for NFS version 4 (EXPERIMENTAL)"
1657 depends on NFS_FS && EXPERIMENTAL 1658 depends on NFS_FS && EXPERIMENTAL
1658 select RPCSEC_GSS_KRB5 1659 select RPCSEC_GSS_KRB5
1659 help 1660 help
1660 Say Y here if you want your NFS client to be able to speak the newer 1661 This option enables support for version 4 of the NFS protocol
1661 version 4 of the NFS protocol. 1662 (RFC 3530) in the kernel's NFS client.
1662 1663
1663 Note: Requires auxiliary userspace daemons which may be found on 1664 To mount NFS servers using NFSv4, you also need to install user
1664 http://www.citi.umich.edu/projects/nfsv4/ 1665 space programs which can be found in the Linux nfs-utils package,
1666 available from http://linux-nfs.org/.
1665 1667
1666 If unsure, say N. 1668 If unsure, say N.
1667 1669
1670config ROOT_NFS
1671 bool "Root file system on NFS"
1672 depends on NFS_FS=y && IP_PNP
1673 help
1674 If you want your system to mount its root file system via NFS,
1675 choose Y here. This is common practice for managing systems
1676 without local permanent storage. For details, read
1677 <file:Documentation/filesystems/nfsroot.txt>.
1678
1679 Most people say N here.
1680
1668config NFSD 1681config NFSD
1669 tristate "NFS server support" 1682 tristate "NFS server support"
1670 depends on INET 1683 depends on INET
@@ -1746,20 +1759,6 @@ config NFSD_V4
1746 1759
1747 If unsure, say N. 1760 If unsure, say N.
1748 1761
1749config ROOT_NFS
1750 bool "Root file system on NFS"
1751 depends on NFS_FS=y && IP_PNP
1752 help
1753 If you want your Linux box to mount its whole root file system (the
1754 one containing the directory /) from some other computer over the
1755 net via NFS (presumably because your box doesn't have a hard disk),
1756 say Y. Read <file:Documentation/filesystems/nfsroot.txt> for
1757 details. It is likely that in this case, you also want to say Y to
1758 "Kernel level IP autoconfiguration" so that your box can discover
1759 its network address at boot time.
1760
1761 Most people say N here.
1762
1763config LOCKD 1762config LOCKD
1764 tristate 1763 tristate
1765 1764
@@ -1800,27 +1799,6 @@ config SUNRPC_XPRT_RDMA
1800 1799
1801 If unsure, say N. 1800 If unsure, say N.
1802 1801
1803config SUNRPC_BIND34
1804 bool "Support for rpcbind versions 3 & 4 (EXPERIMENTAL)"
1805 depends on SUNRPC && EXPERIMENTAL
1806 default n
1807 help
1808 RPC requests over IPv6 networks require support for larger
1809 addresses when performing an RPC bind. Sun added support for
1810 IPv6 addressing by creating two new versions of the rpcbind
1811 protocol (RFC 1833).
1812
1813 This option enables support in the kernel RPC client for
1814 querying rpcbind servers via versions 3 and 4 of the rpcbind
1815 protocol. The kernel automatically falls back to version 2
1816 if a remote rpcbind service does not support versions 3 or 4.
1817 By themselves, these new versions do not provide support for
1818 RPC over IPv6, but the new protocol versions are necessary to
1819 support it.
1820
1821 If unsure, say N to get traditional behavior (version 2 rpcbind
1822 requests only).
1823
1824config RPCSEC_GSS_KRB5 1802config RPCSEC_GSS_KRB5
1825 tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)" 1803 tristate "Secure RPC: Kerberos V mechanism (EXPERIMENTAL)"
1826 depends on SUNRPC && EXPERIMENTAL 1804 depends on SUNRPC && EXPERIMENTAL