The patch titled
Subject: autofs: use autofs instead of autofs4 in documentation
has been added to the -mm tree. Its filename is
autofs-use-autofs-instead-of-autofs4-in-documentation.patch
This patch should soon appear at
http://ozlabs.org/~akpm/mmots/broken-out/autofs-use-autofs-instead-of-autofs4-in-documentation.patch
and later at
http://ozlabs.org/~akpm/mmotm/broken-out/autofs-use-autofs-instead-of-autofs4-in-documentation.patch
Before you just go and hit "reply", please:
a) Consider who else should be cc'ed
b) Prefer to cc a suitable mailing list as well
c) Ideally: find the original patch on the mailing list and do a
reply-to-all to that, adding suitable additional cc's
*** Remember to use Documentation/process/submit-checklist.rst when testing your code ***
The -mm tree is included into linux-next and is updated
there every 3-4 working days
------------------------------------------------------
From: Ian Kent <raven@xxxxxxxxxx>
Subject: autofs: use autofs instead of autofs4 in documentation
Finally remove autofs4 references in the filesystems documentation.
Link: http://lkml.kernel.org/r/152626709055.28589.416082809460051475.stgit@xxxxxxxxxxxxxxxx
Signed-off-by: Ian Kent <raven@xxxxxxxxxx>
Cc: Al Viro <viro@xxxxxxxxxxxxxxxxxx>
Signed-off-by: Andrew Morton <akpm@xxxxxxxxxxxxxxxxxxxx>
---
Documentation/filesystems/00-INDEX | 4 ++--
Documentation/filesystems/autofs-mount-control.txt | 8 ++++----
Documentation/filesystems/autofs.txt | 10 +++++-----
Documentation/filesystems/automount-support.txt | 2 +-
Documentation/filesystems/path-lookup.md | 2 +-
5 files changed, 13 insertions(+), 13 deletions(-)
diff -puN Documentation/filesystems/00-INDEX~autofs-use-autofs-instead-of-autofs4-in-documentation Documentation/filesystems/00-INDEX
--- a/Documentation/filesystems/00-INDEX~autofs-use-autofs-instead-of-autofs4-in-documentation
+++ a/Documentation/filesystems/00-INDEX
@@ -10,8 +10,8 @@ afs.txt
- info and examples for the distributed AFS (Andrew File System) fs.
affs.txt
- info and mount options for the Amiga Fast File System.
-autofs4-mount-control.txt
- - info on device control operations for autofs4 module.
+autofs-mount-control.txt
+ - info on device control operations for autofs module.
automount-support.txt
- information about filesystem automount support.
befs.txt
diff -puN Documentation/filesystems/autofs-mount-control.txt~autofs-use-autofs-instead-of-autofs4-in-documentation Documentation/filesystems/autofs-mount-control.txt
--- a/Documentation/filesystems/autofs-mount-control.txt~autofs-use-autofs-instead-of-autofs4-in-documentation
+++ a/Documentation/filesystems/autofs-mount-control.txt
@@ -1,5 +1,5 @@
-Miscellaneous Device control operations for the autofs4 kernel module
+Miscellaneous Device control operations for the autofs kernel module
====================================================================
The problem
@@ -164,7 +164,7 @@ possibility for future development due t
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.
@@ -244,7 +244,7 @@ The device node ioctl operations impleme
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
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
@@ -254,7 +254,7 @@ detected.
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
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
diff -puN Documentation/filesystems/autofs.txt~autofs-use-autofs-instead-of-autofs4-in-documentation Documentation/filesystems/autofs.txt
--- a/Documentation/filesystems/autofs.txt~autofs-use-autofs-instead-of-autofs4-in-documentation
+++ a/Documentation/filesystems/autofs.txt
@@ -30,15 +30,15 @@ key advantages:
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
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
required with any user-space program. Subsequent text refers to this
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
can each be managed separately, or all managed by the same daemon.
@@ -215,7 +215,7 @@ of expiry.
The VFS also supports "expiry" of mounts using the MNT_EXPIRE flag to
the `umount` system call. Unmounting with MNT_EXPIRE will fail unless
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
recently used. This allows individual names in the autofs directory
to expire separately.
@@ -415,7 +415,7 @@ which can be used to communicate directl
It requires CAP_SYS_ADMIN for access.
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:
struct autofs_dev_ioctl {
diff -puN Documentation/filesystems/automount-support.txt~autofs-use-autofs-instead-of-autofs4-in-documentation Documentation/filesystems/automount-support.txt
--- a/Documentation/filesystems/automount-support.txt~autofs-use-autofs-instead-of-autofs4-in-documentation
+++ a/Documentation/filesystems/automount-support.txt
@@ -9,7 +9,7 @@ also be requested by userspace.
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:
diff -puN Documentation/filesystems/path-lookup.md~autofs-use-autofs-instead-of-autofs4-in-documentation Documentation/filesystems/path-lookup.md
--- a/Documentation/filesystems/path-lookup.md~autofs-use-autofs-instead-of-autofs4-in-documentation
+++ a/Documentation/filesystems/path-lookup.md
@@ -460,7 +460,7 @@ this retry process in the next article.
Automount points are locations in the filesystem where an attempt to
lookup a name can trigger changes to how that lookup should be
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
here.
_
Patches currently in -mm which might be from raven@xxxxxxxxxx are
autofs4-merge-auto_fsh-and-auto_fs4h.patch
autofs4-use-autofs-instead-of-autofs4-everywhere.patch
autofs-copy-autofs4-to-autofs.patch
autofs-create-autofs-kconfig-and-makefile.patch
autofs-update-fs-autofs4-kconfig.patch
autofs-update-fs-autofs4-makefile.patch
autofs-delete-fs-autofs4-source-files.patch
autofs-rename-autofs-documentation-files.patch
autofs-use-autofs-instead-of-autofs4-in-documentation.patch
autofs-update-maintainers-entry-for-autofs.patch
--
To unsubscribe from this list: send the line "unsubscribe mm-commits" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
