Commit b6bb226a authored by Ian Kent's avatar Ian Kent Committed by Linus Torvalds

autofs: use autofs instead of autofs4 in documentation

Finally remove autofs4 references in the filesystems documentation.

Link: http://lkml.kernel.org/r/[email protected]Signed-off-by: default avatarIan Kent <[email protected]>
Cc: Al Viro <[email protected]>
Signed-off-by: default avatarAndrew Morton <[email protected]>
Signed-off-by: default avatarLinus Torvalds <[email protected]>
parent 9005d833
...@@ -10,8 +10,8 @@ afs.txt ...@@ -10,8 +10,8 @@ afs.txt
- info and examples for the distributed AFS (Andrew File System) fs. - info and examples for the distributed AFS (Andrew File System) fs.
affs.txt affs.txt
- info and mount options for the Amiga Fast File System. - info and mount options for the Amiga Fast File System.
autofs4-mount-control.txt autofs-mount-control.txt
- info on device control operations for autofs4 module. - info on device control operations for autofs module.
automount-support.txt automount-support.txt
- information about filesystem automount support. - information about filesystem automount support.
befs.txt befs.txt
......
Miscellaneous Device control operations for the autofs4 kernel module Miscellaneous Device control operations for the autofs kernel module
==================================================================== ====================================================================
The problem The problem
...@@ -164,7 +164,7 @@ possibility for future development due to the requirements of the ...@@ -164,7 +164,7 @@ possibility for future development due to the requirements of the
message bus architecture. message bus architecture.
autofs4 Miscellaneous Device mount control interface autofs Miscellaneous Device mount control interface
==================================================== ====================================================
The control interface is opening a device node, typically /dev/autofs. The control interface is opening a device node, typically /dev/autofs.
...@@ -244,7 +244,7 @@ The device node ioctl operations implemented by this interface are: ...@@ -244,7 +244,7 @@ The device node ioctl operations implemented by this interface are:
AUTOFS_DEV_IOCTL_VERSION AUTOFS_DEV_IOCTL_VERSION
------------------------ ------------------------
Get the major and minor version of the autofs4 device ioctl kernel module Get the major and minor version of the autofs device ioctl kernel module
implementation. It requires an initialized struct autofs_dev_ioctl as an implementation. It requires an initialized struct autofs_dev_ioctl as an
input parameter and sets the version information in the passed in structure. input parameter and sets the version information in the passed in structure.
It returns 0 on success or the error -EINVAL if a version mismatch is It returns 0 on success or the error -EINVAL if a version mismatch is
...@@ -254,7 +254,7 @@ detected. ...@@ -254,7 +254,7 @@ detected.
AUTOFS_DEV_IOCTL_PROTOVER_CMD and AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD AUTOFS_DEV_IOCTL_PROTOVER_CMD and AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD
------------------------------------------------------------------ ------------------------------------------------------------------
Get the major and minor version of the autofs4 protocol version understood Get the major and minor version of the autofs protocol version understood
by loaded module. This call requires an initialized struct autofs_dev_ioctl by loaded module. This call requires an initialized struct autofs_dev_ioctl
with the ioctlfd field set to a valid autofs mount point descriptor with the ioctlfd field set to a valid autofs mount point descriptor
and sets the requested version number in version field of struct args_protover and sets the requested version number in version field of struct args_protover
......
...@@ -30,15 +30,15 @@ key advantages: ...@@ -30,15 +30,15 @@ key advantages:
Context Context
------- -------
The "autofs4" filesystem module is only one part of an autofs system. The "autofs" filesystem module is only one part of an autofs system.
There also needs to be a user-space program which looks up names There also needs to be a user-space program which looks up names
and mounts filesystems. This will often be the "automount" program, and mounts filesystems. This will often be the "automount" program,
though other tools including "systemd" can make use of "autofs4". though other tools including "systemd" can make use of "autofs".
This document describes only the kernel module and the interactions This document describes only the kernel module and the interactions
required with any user-space program. Subsequent text refers to this required with any user-space program. Subsequent text refers to this
as the "automount daemon" or simply "the daemon". as the "automount daemon" or simply "the daemon".
"autofs4" is a Linux kernel module with provides the "autofs" "autofs" is a Linux kernel module with provides the "autofs"
filesystem type. Several "autofs" filesystems can be mounted and they filesystem type. Several "autofs" filesystems can be mounted and they
can each be managed separately, or all managed by the same daemon. can each be managed separately, or all managed by the same daemon.
...@@ -215,7 +215,7 @@ of expiry. ...@@ -215,7 +215,7 @@ of expiry.
The VFS also supports "expiry" of mounts using the MNT_EXPIRE flag to The VFS also supports "expiry" of mounts using the MNT_EXPIRE flag to
the `umount` system call. Unmounting with MNT_EXPIRE will fail unless the `umount` system call. Unmounting with MNT_EXPIRE will fail unless
a previous attempt had been made, and the filesystem has been inactive a previous attempt had been made, and the filesystem has been inactive
and untouched since that previous attempt. autofs4 does not depend on and untouched since that previous attempt. autofs does not depend on
this but has its own internal tracking of whether filesystems were this but has its own internal tracking of whether filesystems were
recently used. This allows individual names in the autofs directory recently used. This allows individual names in the autofs directory
to expire separately. to expire separately.
...@@ -415,7 +415,7 @@ which can be used to communicate directly with the autofs filesystem. ...@@ -415,7 +415,7 @@ which can be used to communicate directly with the autofs filesystem.
It requires CAP_SYS_ADMIN for access. It requires CAP_SYS_ADMIN for access.
The `ioctl`s that can be used on this device are described in a separate The `ioctl`s that can be used on this device are described in a separate
document `autofs4-mount-control.txt`, and are summarized briefly here. document `autofs-mount-control.txt`, and are summarized briefly here.
Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure: Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure:
struct autofs_dev_ioctl { struct autofs_dev_ioctl {
......
...@@ -9,7 +9,7 @@ also be requested by userspace. ...@@ -9,7 +9,7 @@ also be requested by userspace.
IN-KERNEL AUTOMOUNTING IN-KERNEL AUTOMOUNTING
====================== ======================
See section "Mount Traps" of Documentation/filesystems/autofs4.txt See section "Mount Traps" of Documentation/filesystems/autofs.txt
Then from userspace, you can just do something like: Then from userspace, you can just do something like:
......
...@@ -460,7 +460,7 @@ this retry process in the next article. ...@@ -460,7 +460,7 @@ this retry process in the next article.
Automount points are locations in the filesystem where an attempt to Automount points are locations in the filesystem where an attempt to
lookup a name can trigger changes to how that lookup should be lookup a name can trigger changes to how that lookup should be
handled, in particular by mounting a filesystem there. These are handled, in particular by mounting a filesystem there. These are
covered in greater detail in autofs4.txt in the Linux documentation covered in greater detail in autofs.txt in the Linux documentation
tree, but a few notes specifically related to path lookup are in order tree, but a few notes specifically related to path lookup are in order
here. here.
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment