Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
Hi Pádraig,
On 3/14/22 20:56, Alejandro Colomar (man-pages) wrote:
> Please send the patch inline (or both inline and attached),
> if you don't mind.
> However, if it's a big hassle for you,
> I can apply it from an attachment.
Thanks for the inline patcx.
> ---
>
>>
>> Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
>>
[...]
>>
>> Signed-off-by: Pádraig Brady
>
> Makes sense to me.
> But see a few minor comments below.
But you missed the comments below :)
Please fix them (see below).
Thanks,
Alex
[...]
>> diff --git a/man2/statx.2 b/man2/statx.2
>> index 04b3e5075..d4e638756 100644
>> --- a/man2/statx.2
>> +++ b/man2/statx.2
>> @@ -195,11 +195,23 @@ Don't automount the terminal ("basename") component of
>> if it is a directory that is an automount point.
>> This allows the caller to gather attributes of an automount point
>> (rather than the location it would mount).
>> -This flag can be used in tools that scan directories
>> -to prevent mass-automounting of a directory of automount points.
>> +This
>> +flag has no effect if the mount point has already been mounted over.
>
> Weird break point there.
> I see that it was like that in existing code, but please fix it :)
check
>
>> +.IP
>> The
>> .B AT_NO_AUTOMOUNT
>> -flag has no effect if the mount point has already been mounted over.
>> +flag can be used in tools that scan directories
>> +to prevent mass-automounting of a directory of automount points.
>> +.IP
>> +All of
>> +.BR stat () ,
>
> s/() ,/(2),/
check
>
>> +.BR lstat () ,
>
> s/() ,/(2),/
check
>
>> +and
>> +.BR fstatat ()
>
> s/()/(2)/
check
>
>> +act as though
>> +.B AT_NO_AUTOMOUNT
>> +was set.
>> +.IP
>> This flag is Linux-specific; define
>> .B _GNU_SOURCE
>> .\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
>> --
>> 2.31.1
>>
>
>
--
Alejandro Colomar
Linux man-pages comaintainer; https://www.kernel.org/doc/man-pages/
http://www.alejandro-colomar.es/
Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
On 3/14/22 19:02, Pádraig Brady wrote:
> On 14/03/2022 13:24, Alejandro Colomar (man-pages) wrote:
>> On 3/10/22 14:46, Pádraig Brady wrote:
>>> Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
>>>
>>> Don't mention AT_NO_AUTOMOUNT for fstatat.2
>>> as it's implied since v4.11-rc7-14-gdeccf497d804
>>
>> Even though it's implied, since code may pass it,
>> and especially code written based on the old manual page,
>> it would be good to keep the paragraph in fstatat.2,
>> even if the text is replaced by something like
>> "Before Linux x.xx, this flag was ignored.
>> After Linux y.yy, this flag is implied."
>>
>> Does it make sense to you?
>
> Yes good point.
> I went through the git history and the summary is fstatat()
> honored the flag since 2.6.38,
> ignored the flag since 3.1,
> implied the flag since 4.11,
>
> I'll add that info to fstatat(2), and the details to the commit message.
>
>>> Don't mention commit v4.13-9318-g42f461482178 as it was reverted
>>
>> Please also mention v4.15-rc1-50-g5d38f049cee1 as the commit in which it
>> was reverted.
>> Since it was present in some kernel releases, we might want to mention
>> it in the manual page?
>
> Well since the flag for fstatat() doesn't change anything since 3.1
> it's probably best not to mention this old, short lived, and very
> specific info.
Okay.
>
>>> Mention that stat(), lstat(), and fstatat()
>>> imply AT_NO_AUTOMOUNT, on the statx.2 man page
>>
>> Please sign the patch with "Signed-off-by: ..."
>> <https://www.kernel.org/doc/man-pages/patches.html>
>
> Done in the attached.
Please send the patch inline (or both inline and attached),
if you don't mind.
However, if it's a big hassle for you,
I can apply it from an attachment.
>
> thanks!
> Pádraig
---
>
> Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
>
> fstatat(..., AT_NO_AUTOMOUNT) has had the following history in Linux:
> v2.6.37-7314-g6f45b65672c8
> add AT_NO_AUTOMOUNT and fstatat honors it
> v3.1-rc7-68-gb6c8069d3577
> ignore AT_NO_AUTOMOUNT since default operation now less eagerly mounts
> v4.10-11255-ga528d35e8bfc
> adds statx which reinstated 2.6.38 behavior for fstatat (not released)
> v4.11-rc7-14-gdeccf497d804
> adjust fstatat so that AT_NO_AUTOMOUNT always specified (to statx)
>
> * man2/stat.2:
> Adjust AT_NO_AUTOMOUNT description for fstatat.2 as per the above,
> to indicate AT_NO_AUTOMOUNT should be avoided with fstatat() since
> it's ignored since 3.1 and implied since 4.11.
>
> Don't mention commit v4.13-9318-g42f461482178 as it was reverted,
> and moot anyway since we can't adjust AT_NO_AUTOMOUNT since 3.1.
>
> * man2/statx.2:
> Mention that stat(), lstat(), and fstatat() imply AT_NO_AUTOMOUNT.
>
> Signed-off-by: Pádraig Brady
Makes sense to me.
But see a few minor comments below.
Thanks,
Alex
> ---
> man2/stat.2 | 31 +++
> man2/statx.2 | 18 +++---
> 2 files changed, 18 insertions(+), 31 deletions(-)
>
> diff --git a/man2/stat.2 b/man2/stat.2
> index 016c1f47d..9000b2ca6 100644
> --- a/man2/stat.2
> +++ b/man2/stat.2
> @@ -319,34 +319,9 @@ to obtain its definition.
> .TP
> .BR AT_NO_AUTOMOUNT " (since Linux 2.6.38)"
> Don't automount the terminal ("basename") component of
> -.I pathname
> -if it is a directory that is an automount point.
> -This allows the caller to gather attributes of an automount point
> -(rather than the location it would mount).
> -Since Linux 4.14,
> -.\" commit 42f46148217865a545e129612075f3d828a2c4e4
> -also don't instantiate a nonexistent name in an
> -on-demand directory such as used for automounter indirect maps.
> -This
> -flag has no effect if the mount point has already been mounted over.
> -.IP
> -Both
> -.BR stat ()
> -and
> -.BR lstat ()
> -act as though
> -.B AT_NO_AUTOMOUNT
> -was set.
> -.IP
> -The
> -.B AT_NO_AUTOMOUNT
> -can be used in tools that scan directories
> -to prevent mass-automounting of a directory of automount points.
> -.IP
> -This flag is Linux-specific; define
> -.B _GNU_SOURCE
> -.\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
> -to obtain its definition.
> +.I pathname.
> +Since Linux 3.1 this flag is ignored.
> +Since Linux 4.11 this flag is implied.
> .TP
> .B AT_SYMLINK_NOFOLLOW
> If
> diff --git a/man2/statx.2 b/man2/statx.2
> index 04b3e5075..d4e638756 100644
> --- a/man2/statx.2
> +++ b/man2/statx.2
> @@ -195,11 +19
Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
On 14/03/2022 13:24, Alejandro Colomar (man-pages) wrote:
[Added a few CCs from the relevant kernel commits]
Hi Pádraig,
On 3/10/22 14:46, Pádraig Brady wrote:
On 10/03/2022 07:44, Andreas Schwab wrote:
On Mär 09 2022, Paul Eggert wrote:
I audited gnulib's uses of fstatat and found one fishy one that doesn't
use AT_NO_AUTOMOUNT, namely, in fts.c where the follow-symlink branch
uses
'stat' whereas the no-follow-symlink branch uses fstatat without
AT_NO_AUTOMOUNT. I installed the first patch to cause it be
consistent in
using AT_NO_AUTOMOUNT, which is also consistent with what glibc does
??? In glibc, stat is the same as fstatat(,,,0).
Indeed. It looks like the man page for fstatat is out of date.
After looking at the kernel code, it seems that:
fstatat() did _not_ imply AT_NO_AUTOMOUNT from 2.6.38 -> 4.11
I'm not sure it even honored the AT_NO_AUTOMOUNT flag before 4.11
fstatat() did imply AT_NO_AUTOMOUNT since 4.11
The attached patch clarifies this is the fstatat and statx man pages.
sorry for the confusion,
Pádraig
---
Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
Don't mention AT_NO_AUTOMOUNT for fstatat.2
as it's implied since v4.11-rc7-14-gdeccf497d804
Even though it's implied, since code may pass it,
and especially code written based on the old manual page,
it would be good to keep the paragraph in fstatat.2,
even if the text is replaced by something like
"Before Linux x.xx, this flag was ignored.
After Linux y.yy, this flag is implied."
Does it make sense to you?
Yes good point.
I went through the git history and the summary is fstatat()
honored the flag since 2.6.38,
ignored the flag since 3.1,
implied the flag since 4.11,
I'll add that info to fstatat(2), and the details to the commit message.
Don't mention commit v4.13-9318-g42f461482178 as it was reverted
Please also mention v4.15-rc1-50-g5d38f049cee1 as the commit in which it
was reverted.
Since it was present in some kernel releases, we might want to mention
it in the manual page?
Well since the flag for fstatat() doesn't change anything since 3.1
it's probably best not to mention this old, short lived, and very specific info.
Mention that stat(), lstat(), and fstatat()
imply AT_NO_AUTOMOUNT, on the statx.2 man page
Please sign the patch with "Signed-off-by: ..."
<https://www.kernel.org/doc/man-pages/patches.html>
Done in the attached.
thanks!
Pádraig
From f45367d494d9e97fa8a18d8e477e1facf259688c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?=
Date: Thu, 10 Mar 2022 13:37:11 +
Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
fstatat(..., AT_NO_AUTOMOUNT) has had the following history in Linux:
v2.6.37-7314-g6f45b65672c8
add AT_NO_AUTOMOUNT and fstatat honors it
v3.1-rc7-68-gb6c8069d3577
ignore AT_NO_AUTOMOUNT since default operation now less eagerly mounts
v4.10-11255-ga528d35e8bfc
adds statx which reinstated 2.6.38 behavior for fstatat (not released)
v4.11-rc7-14-gdeccf497d804
adjust fstatat so that AT_NO_AUTOMOUNT always specified (to statx)
* man2/stat.2:
Adjust AT_NO_AUTOMOUNT description for fstatat.2 as per the above,
to indicate AT_NO_AUTOMOUNT should be avoided with fstatat() since
it's ignored since 3.1 and implied since 4.11.
Don't mention commit v4.13-9318-g42f461482178 as it was reverted,
and moot anyway since we can't adjust AT_NO_AUTOMOUNT since 3.1.
* man2/statx.2:
Mention that stat(), lstat(), and fstatat() imply AT_NO_AUTOMOUNT.
Signed-off-by: Pádraig Brady
---
man2/stat.2 | 31 +++
man2/statx.2 | 18 +++---
2 files changed, 18 insertions(+), 31 deletions(-)
diff --git a/man2/stat.2 b/man2/stat.2
index 016c1f47d..9000b2ca6 100644
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -319,34 +319,9 @@ to obtain its definition.
.TP
.BR AT_NO_AUTOMOUNT " (since Linux 2.6.38)"
Don't automount the terminal ("basename") component of
-.I pathname
-if it is a directory that is an automount point.
-This allows the caller to gather attributes of an automount point
-(rather than the location it would mount).
-Since Linux 4.14,
-.\" commit 42f46148217865a545e129612075f3d828a2c4e4
-also don't instantiate a nonexistent name in an
-on-demand directory such as used for automounter indirect maps.
-This
-flag has no effect if the mount point has already been mounted over.
-.IP
-Both
-.BR stat ()
-and
-.BR lstat ()
-act as though
-.B AT_NO_AUTOMOUNT
-was set.
-.IP
-The
-.B AT_NO_AUTOMOUNT
-can be used in tools that scan directories
-to prevent mass-automounting of a directory of automount points.
-.IP
-This flag is Linux-specific; define
-.B _GNU_SOURCE
-.\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
-to obtain its definition.
+.I pathname.
+Since Linux 3.1 this fl
Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
[Added a few CCs from the relevant kernel commits]
Hi Pádraig,
On 3/10/22 14:46, Pádraig Brady wrote:
> On 10/03/2022 07:44, Andreas Schwab wrote:
>> On Mär 09 2022, Paul Eggert wrote:
>>
>>> I audited gnulib's uses of fstatat and found one fishy one that doesn't
>>> use AT_NO_AUTOMOUNT, namely, in fts.c where the follow-symlink branch
>>> uses
>>> 'stat' whereas the no-follow-symlink branch uses fstatat without
>>> AT_NO_AUTOMOUNT. I installed the first patch to cause it be
>>> consistent in
>>> using AT_NO_AUTOMOUNT, which is also consistent with what glibc does
>>
>> ??? In glibc, stat is the same as fstatat(,,,0).
>
> Indeed. It looks like the man page for fstatat is out of date.
> After looking at the kernel code, it seems that:
> fstatat() did _not_ imply AT_NO_AUTOMOUNT from 2.6.38 -> 4.11
> I'm not sure it even honored the AT_NO_AUTOMOUNT flag before 4.11
> fstatat() did imply AT_NO_AUTOMOUNT since 4.11
>
> The attached patch clarifies this is the fstatat and statx man pages.
>
> sorry for the confusion,
> Pádraig
---
> Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
>
> Don't mention AT_NO_AUTOMOUNT for fstatat.2
> as it's implied since v4.11-rc7-14-gdeccf497d804
Even though it's implied, since code may pass it,
and especially code written based on the old manual page,
it would be good to keep the paragraph in fstatat.2,
even if the text is replaced by something like
"Before Linux x.xx, this flag was ignored.
After Linux y.yy, this flag is implied."
Does it make sense to you?
>
> Don't mention commit v4.13-9318-g42f461482178 as it was reverted
Please also mention v4.15-rc1-50-g5d38f049cee1 as the commit in which it
was reverted.
Since it was present in some kernel releases, we might want to mention
it in the manual page?
>
> Mention that stat(), lstat(), and fstatat()
> imply AT_NO_AUTOMOUNT, on the statx.2 man page
Please sign the patch with "Signed-off-by: ..."
<https://www.kernel.org/doc/man-pages/patches.html>
> ---
> man2/stat.2 | 31 ---
> man2/statx.2 | 18 +++---
> 2 files changed, 15 insertions(+), 34 deletions(-)
>
> diff --git a/man2/stat.2 b/man2/stat.2
> index 016c1f47d..43ab5b777 100644
> --- a/man2/stat.2
> +++ b/man2/stat.2
> @@ -317,37 +317,6 @@ This flag is Linux-specific; define
> .\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
> to obtain its definition.
> .TP
> -.BR AT_NO_AUTOMOUNT " (since Linux 2.6.38)"
> -Don't automount the terminal ("basename") component of
> -.I pathname
> -if it is a directory that is an automount point.
> -This allows the caller to gather attributes of an automount point
> -(rather than the location it would mount).
> -Since Linux 4.14,
> -.\" commit 42f46148217865a545e129612075f3d828a2c4e4
> -also don't instantiate a nonexistent name in an
> -on-demand directory such as used for automounter indirect maps.
> -This
> -flag has no effect if the mount point has already been mounted over.
> -.IP
> -Both
> -.BR stat ()
> -and
> -.BR lstat ()
> -act as though
> -.B AT_NO_AUTOMOUNT
> -was set.
> -.IP
> -The
> -.B AT_NO_AUTOMOUNT
> -can be used in tools that scan directories
> -to prevent mass-automounting of a directory of automount points.
> -.IP
> -This flag is Linux-specific; define
> -.B _GNU_SOURCE
> -.\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
> -to obtain its definition.
> -.TP
> .B AT_SYMLINK_NOFOLLOW
> If
> .I pathname
> diff --git a/man2/statx.2 b/man2/statx.2
> index 04b3e5075..d4e638756 100644
> --- a/man2/statx.2
> +++ b/man2/statx.2
> @@ -195,11 +195,23 @@ Don't automount the terminal ("basename") component of
> if it is a directory that is an automount point.
> This allows the caller to gather attributes of an automount point
> (rather than the location it would mount).
> -This flag can be used in tools that scan directories
> -to prevent mass-automounting of a directory of automount points.
> +This
> +flag has no effect if the mount point has already been mounted over.
> +.IP
> The
> .B AT_NO_AUTOMOUNT
> -flag has no effect if the mount point has already been mounted over.
> +flag can be used in tools that scan directories
> +to prevent mass-automounting of a directory of automount points.
> +.IP
> +All of
> +.BR stat () ,
s/() ,/(2),/
See man-pages(7) for when to put a number and when not:
Formatting conventions for manual pages describing functions
[...]
Any reference to the subject of the current manual page
should be w
Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
On 3/10/22 11:39, Pádraig Brady wrote:
The changes are a net improvement I think since fewer interfaces are used.
I would remove the AT_NO_AUTOMOUNT parameters to fstatat() though,
since they're redundant it seems, and would only result in confusion
if the patch is applied to remove that flag from the fstatat(2) man page.
OK, thanks, I installed the attached to do that.
From 51a5361a285783dd1bdc418bdad043069322d951 Mon Sep 17 00:00:00 2001
From: Paul Eggert
Date: Thu, 10 Mar 2022 13:07:53 -0800
Subject: [PATCH] fts: revert change to use AT_NO_AUTOMOUNT
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
* NEWS: Don’t mention AT_NO_AUTOMOUNT.
* lib/fts.c (fts_stat): Don’t use AT_NO_AUTOMOUNT, as
it has no effect with fstatat.
---
ChangeLog | 7 +++
NEWS | 3 +--
lib/fts.c | 4 ++--
3 files changed, 10 insertions(+), 4 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 294f6286f3..7713294982 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,10 @@
+2022-03-10 Paul Eggert
+
+ fts: revert change to use AT_NO_AUTOMOUNT
+ * NEWS: Don’t mention AT_NO_AUTOMOUNT.
+ * lib/fts.c (fts_stat): Don’t use AT_NO_AUTOMOUNT, as
+ it has no effect with fstatat.
+
2022-03-09 Paul Eggert
statat: now obsolete
diff --git a/NEWS b/NEWS
index 8f90d8e958..1a1c21970a 100644
--- a/NEWS
+++ b/NEWS
@@ -66,8 +66,7 @@ User visible incompatible changes
DateModules Changes
-2022-03-09 statat This module is deprecated. Use fstatat instead,
-to specify whether you want AT_NO_AUTOMOUNT.
+2022-03-09 statat This module is deprecated. Use fstatat instead.
2022-01-05 stack This module now uses idx_t instead of size_t
for indexes and counts.
diff --git a/lib/fts.c b/lib/fts.c
index a1a7c09fdb..494a63af96 100644
--- a/lib/fts.c
+++ b/lib/fts.c
@@ -1775,12 +1775,12 @@ fts_stat(FTS *sp, register FTSENT *p, bool follow)
* a stat(2). If that fails, check for a non-existent symlink. If
* fail, set the errno from the stat call.
*/
-int flags = (follow ? 0 : AT_SYMLINK_NOFOLLOW) | AT_NO_AUTOMOUNT;
+int flags = follow ? 0 : AT_SYMLINK_NOFOLLOW;
if (fstatat (sp->fts_cwd_fd, p->fts_accpath, sbp, flags) < 0)
{
if (follow && errno == ENOENT
&& 0 <= fstatat (sp->fts_cwd_fd, p->fts_accpath, sbp,
- AT_SYMLINK_NOFOLLOW | AT_NO_AUTOMOUNT))
+ AT_SYMLINK_NOFOLLOW))
{
__set_errno (0);
return FTS_SLNONE;
--
2.35.1
Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
On 10/03/2022 19:29, Paul Eggert wrote: On 3/10/22 05:46, Pádraig Brady wrote: After looking at the kernel code, it seems that: fstatat() did _not_ imply AT_NO_AUTOMOUNT from 2.6.38 -> 4.11 I'm not sure it even honored the AT_NO_AUTOMOUNT flag before 4.11 fstatat() did imply AT_NO_AUTOMOUNT since 4.11 Ouch, so this whole thing has been a false alarm? Well, in some sense that's a relief; in another sense I wonder whether we should undo some of the recent Gnulib changes. The changes are a net improvement I think since fewer interfaces are used. I would remove the AT_NO_AUTOMOUNT parameters to fstatat() though, since they're redundant it seems, and would only result in confusion if the patch is applied to remove that flag from the fstatat(2) man page. thanks, Pádraig
Re: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
On 3/10/22 05:46, Pádraig Brady wrote: After looking at the kernel code, it seems that: fstatat() did _not_ imply AT_NO_AUTOMOUNT from 2.6.38 -> 4.11 I'm not sure it even honored the AT_NO_AUTOMOUNT flag before 4.11 fstatat() did imply AT_NO_AUTOMOUNT since 4.11 Ouch, so this whole thing has been a false alarm? Well, in some sense that's a relief; in another sense I wonder whether we should undo some of the recent Gnulib changes.
[PATCH] fix descriptions for AT_NO_AUTOMOUNT
On 10/03/2022 07:44, Andreas Schwab wrote:
On Mär 09 2022, Paul Eggert wrote:
I audited gnulib's uses of fstatat and found one fishy one that doesn't
use AT_NO_AUTOMOUNT, namely, in fts.c where the follow-symlink branch uses
'stat' whereas the no-follow-symlink branch uses fstatat without
AT_NO_AUTOMOUNT. I installed the first patch to cause it be consistent in
using AT_NO_AUTOMOUNT, which is also consistent with what glibc does
??? In glibc, stat is the same as fstatat(,,,0).
Indeed. It looks like the man page for fstatat is out of date.
After looking at the kernel code, it seems that:
fstatat() did _not_ imply AT_NO_AUTOMOUNT from 2.6.38 -> 4.11
I'm not sure it even honored the AT_NO_AUTOMOUNT flag before 4.11
fstatat() did imply AT_NO_AUTOMOUNT since 4.11
The attached patch clarifies this is the fstatat and statx man pages.
sorry for the confusion,
PádraigFrom d5c356f18b18cceb245ae9df175322760f32fb2a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?P=C3=A1draig=20Brady?=
Date: Thu, 10 Mar 2022 13:37:11 +
Subject: [PATCH] fix descriptions for AT_NO_AUTOMOUNT
Don't mention AT_NO_AUTOMOUNT for fstatat.2
as it's implied since v4.11-rc7-14-gdeccf497d804
Don't mention commit v4.13-9318-g42f461482178 as it was reverted
Mention that stat(), lstat(), and fstatat()
imply AT_NO_AUTOMOUNT, on the statx.2 man page
---
man2/stat.2 | 31 ---
man2/statx.2 | 18 +++---
2 files changed, 15 insertions(+), 34 deletions(-)
diff --git a/man2/stat.2 b/man2/stat.2
index 016c1f47d..43ab5b777 100644
--- a/man2/stat.2
+++ b/man2/stat.2
@@ -317,37 +317,6 @@ This flag is Linux-specific; define
.\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
to obtain its definition.
.TP
-.BR AT_NO_AUTOMOUNT " (since Linux 2.6.38)"
-Don't automount the terminal ("basename") component of
-.I pathname
-if it is a directory that is an automount point.
-This allows the caller to gather attributes of an automount point
-(rather than the location it would mount).
-Since Linux 4.14,
-.\" commit 42f46148217865a545e129612075f3d828a2c4e4
-also don't instantiate a nonexistent name in an
-on-demand directory such as used for automounter indirect maps.
-This
-flag has no effect if the mount point has already been mounted over.
-.IP
-Both
-.BR stat ()
-and
-.BR lstat ()
-act as though
-.B AT_NO_AUTOMOUNT
-was set.
-.IP
-The
-.B AT_NO_AUTOMOUNT
-can be used in tools that scan directories
-to prevent mass-automounting of a directory of automount points.
-.IP
-This flag is Linux-specific; define
-.B _GNU_SOURCE
-.\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
-to obtain its definition.
-.TP
.B AT_SYMLINK_NOFOLLOW
If
.I pathname
diff --git a/man2/statx.2 b/man2/statx.2
index 04b3e5075..d4e638756 100644
--- a/man2/statx.2
+++ b/man2/statx.2
@@ -195,11 +195,23 @@ Don't automount the terminal ("basename") component of
if it is a directory that is an automount point.
This allows the caller to gather attributes of an automount point
(rather than the location it would mount).
-This flag can be used in tools that scan directories
-to prevent mass-automounting of a directory of automount points.
+This
+flag has no effect if the mount point has already been mounted over.
+.IP
The
.B AT_NO_AUTOMOUNT
-flag has no effect if the mount point has already been mounted over.
+flag can be used in tools that scan directories
+to prevent mass-automounting of a directory of automount points.
+.IP
+All of
+.BR stat () ,
+.BR lstat () ,
+and
+.BR fstatat ()
+act as though
+.B AT_NO_AUTOMOUNT
+was set.
+.IP
This flag is Linux-specific; define
.B _GNU_SOURCE
.\" Before glibc 2.16, defining _ATFILE_SOURCE sufficed
--
2.31.1
