Skip to content

Commit b6bb226

Browse files
raven-autorvalds
authored andcommitted
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: Ian Kent <[email protected]> Cc: Al Viro <[email protected]> Signed-off-by: Andrew Morton <[email protected]> Signed-off-by: Linus Torvalds <[email protected]>
1 parent 9005d83 commit b6bb226

File tree

5 files changed

+13
-13
lines changed

5 files changed

+13
-13
lines changed

Documentation/filesystems/00-INDEX

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,8 +10,8 @@ afs.txt
1010
- info and examples for the distributed AFS (Andrew File System) fs.
1111
affs.txt
1212
- info and mount options for the Amiga Fast File System.
13-
autofs4-mount-control.txt
14-
- info on device control operations for autofs4 module.
13+
autofs-mount-control.txt
14+
- info on device control operations for autofs module.
1515
automount-support.txt
1616
- information about filesystem automount support.
1717
befs.txt

Documentation/filesystems/autofs-mount-control.txt

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11

2-
Miscellaneous Device control operations for the autofs4 kernel module
2+
Miscellaneous Device control operations for the autofs kernel module
33
====================================================================
44

55
The problem
@@ -164,7 +164,7 @@ possibility for future development due to the requirements of the
164164
message bus architecture.
165165

166166

167-
autofs4 Miscellaneous Device mount control interface
167+
autofs Miscellaneous Device mount control interface
168168
====================================================
169169

170170
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:
244244
AUTOFS_DEV_IOCTL_VERSION
245245
------------------------
246246

247-
Get the major and minor version of the autofs4 device ioctl kernel module
247+
Get the major and minor version of the autofs device ioctl kernel module
248248
implementation. It requires an initialized struct autofs_dev_ioctl as an
249249
input parameter and sets the version information in the passed in structure.
250250
It returns 0 on success or the error -EINVAL if a version mismatch is
@@ -254,7 +254,7 @@ detected.
254254
AUTOFS_DEV_IOCTL_PROTOVER_CMD and AUTOFS_DEV_IOCTL_PROTOSUBVER_CMD
255255
------------------------------------------------------------------
256256

257-
Get the major and minor version of the autofs4 protocol version understood
257+
Get the major and minor version of the autofs protocol version understood
258258
by loaded module. This call requires an initialized struct autofs_dev_ioctl
259259
with the ioctlfd field set to a valid autofs mount point descriptor
260260
and sets the requested version number in version field of struct args_protover

Documentation/filesystems/autofs.txt

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -30,15 +30,15 @@ key advantages:
3030
Context
3131
-------
3232

33-
The "autofs4" filesystem module is only one part of an autofs system.
33+
The "autofs" filesystem module is only one part of an autofs system.
3434
There also needs to be a user-space program which looks up names
3535
and mounts filesystems. This will often be the "automount" program,
36-
though other tools including "systemd" can make use of "autofs4".
36+
though other tools including "systemd" can make use of "autofs".
3737
This document describes only the kernel module and the interactions
3838
required with any user-space program. Subsequent text refers to this
3939
as the "automount daemon" or simply "the daemon".
4040

41-
"autofs4" is a Linux kernel module with provides the "autofs"
41+
"autofs" is a Linux kernel module with provides the "autofs"
4242
filesystem type. Several "autofs" filesystems can be mounted and they
4343
can each be managed separately, or all managed by the same daemon.
4444

@@ -215,7 +215,7 @@ of expiry.
215215
The VFS also supports "expiry" of mounts using the MNT_EXPIRE flag to
216216
the `umount` system call. Unmounting with MNT_EXPIRE will fail unless
217217
a previous attempt had been made, and the filesystem has been inactive
218-
and untouched since that previous attempt. autofs4 does not depend on
218+
and untouched since that previous attempt. autofs does not depend on
219219
this but has its own internal tracking of whether filesystems were
220220
recently used. This allows individual names in the autofs directory
221221
to expire separately.
@@ -415,7 +415,7 @@ which can be used to communicate directly with the autofs filesystem.
415415
It requires CAP_SYS_ADMIN for access.
416416

417417
The `ioctl`s that can be used on this device are described in a separate
418-
document `autofs4-mount-control.txt`, and are summarized briefly here.
418+
document `autofs-mount-control.txt`, and are summarized briefly here.
419419
Each ioctl is passed a pointer to an `autofs_dev_ioctl` structure:
420420

421421
struct autofs_dev_ioctl {

Documentation/filesystems/automount-support.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ also be requested by userspace.
99
IN-KERNEL AUTOMOUNTING
1010
======================
1111

12-
See section "Mount Traps" of Documentation/filesystems/autofs4.txt
12+
See section "Mount Traps" of Documentation/filesystems/autofs.txt
1313

1414
Then from userspace, you can just do something like:
1515

Documentation/filesystems/path-lookup.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -460,7 +460,7 @@ this retry process in the next article.
460460
Automount points are locations in the filesystem where an attempt to
461461
lookup a name can trigger changes to how that lookup should be
462462
handled, in particular by mounting a filesystem there. These are
463-
covered in greater detail in autofs4.txt in the Linux documentation
463+
covered in greater detail in autofs.txt in the Linux documentation
464464
tree, but a few notes specifically related to path lookup are in order
465465
here.
466466

0 commit comments

Comments
 (0)