|
 |
cf1fd2 |
From f4422844dbcd839ce486bcbc15b7bd5b72c9198d Mon Sep 17 00:00:00 2001
|
|
|
cf1fd2 |
From: Rohan Sable <rsable@redhat.com>
|
|
|
cf1fd2 |
Date: Mon, 7 Mar 2022 14:14:13 +0000
|
|
|
cf1fd2 |
Subject: [PATCH 1/2] ls: avoid triggering automounts
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
statx() has different defaults wrt automounting
|
|
|
cf1fd2 |
compared to stat() or lstat(), so explicitly
|
|
|
cf1fd2 |
set the AT_NO_AUTOMOUNT flag to suppress that behavior,
|
|
|
cf1fd2 |
and avoid unintended operations or potential errors.
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
* src/ls.c (do_statx): Pass AT_NO_AUTOMOUNT to avoid this behavior.
|
|
|
cf1fd2 |
Fixes https://bugs.gnu.org/54286
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
Signed-off-by: Rohan Sable <rsable@redhat.com>
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
Upstream-commit: 85c975df2c25bd799370b04bb294e568e001102f
|
|
|
cf1fd2 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
cf1fd2 |
---
|
|
|
cf1fd2 |
src/ls.c | 2 +-
|
|
|
cf1fd2 |
1 file changed, 1 insertion(+), 1 deletion(-)
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
diff --git a/src/ls.c b/src/ls.c
|
|
|
cf1fd2 |
index 1047801..fe0e9f8 100644
|
|
|
cf1fd2 |
--- a/src/ls.c
|
|
|
cf1fd2 |
+++ b/src/ls.c
|
|
|
cf1fd2 |
@@ -1126,7 +1126,7 @@ do_statx (int fd, const char *name, struct stat *st, int flags,
|
|
|
cf1fd2 |
unsigned int mask)
|
|
|
cf1fd2 |
{
|
|
|
cf1fd2 |
struct statx stx;
|
|
|
cf1fd2 |
- int ret = statx (fd, name, flags, mask, &stx;;
|
|
|
cf1fd2 |
+ int ret = statx (fd, name, flags | AT_NO_AUTOMOUNT, mask, &stx;;
|
|
|
cf1fd2 |
if (ret >= 0)
|
|
|
cf1fd2 |
statx_to_stat (&stx, st);
|
|
|
cf1fd2 |
return ret;
|
|
|
cf1fd2 |
--
|
|
|
cf1fd2 |
2.34.1
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
From 3d227f9e4f3fe806064721e4b9451ee06526bc80 Mon Sep 17 00:00:00 2001
|
|
|
cf1fd2 |
From: =?UTF-8?q?P=C3=A1draig=20Brady?= <P@draigBrady.com>
|
|
|
cf1fd2 |
Date: Mon, 7 Mar 2022 23:29:20 +0000
|
|
|
cf1fd2 |
Subject: [PATCH 2/2] stat: only automount with --cached=never
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
Revert to the default behavior before the introduction of statx().
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
* src/stat.c (do_stat): Set AT_NO_AUTOMOUNT without --cached=never.
|
|
|
cf1fd2 |
* doc/coreutils.texi (stat invocation): Mention the automount
|
|
|
cf1fd2 |
behavior with --cached=never.
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
Fixes https://bugs.gnu.org/54287
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
Upstream-commit: 92cb8427c537f37edd43c5cef1909585201372ab
|
|
|
cf1fd2 |
Signed-off-by: Kamil Dudka <kdudka@redhat.com>
|
|
|
cf1fd2 |
---
|
|
|
cf1fd2 |
doc/coreutils.texi | 1 +
|
|
|
cf1fd2 |
src/stat.c | 3 +++
|
|
|
cf1fd2 |
2 files changed, 4 insertions(+)
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
diff --git a/doc/coreutils.texi b/doc/coreutils.texi
|
|
|
cf1fd2 |
index 19b535c..0f5c16a 100644
|
|
|
cf1fd2 |
--- a/doc/coreutils.texi
|
|
|
cf1fd2 |
+++ b/doc/coreutils.texi
|
|
|
cf1fd2 |
@@ -12204,6 +12204,7 @@ Always read the already cached attributes if available.
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
@item never
|
|
|
cf1fd2 |
Always sychronize with the latest file system attributes.
|
|
|
cf1fd2 |
+This also mounts automounted files.
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
@item default
|
|
|
cf1fd2 |
Leave the caching behavior to the underlying file system.
|
|
|
cf1fd2 |
diff --git a/src/stat.c b/src/stat.c
|
|
|
cf1fd2 |
index 0c34501..803340a 100644
|
|
|
cf1fd2 |
--- a/src/stat.c
|
|
|
cf1fd2 |
+++ b/src/stat.c
|
|
|
cf1fd2 |
@@ -1343,6 +1343,9 @@ do_stat (char const *filename, char const *format, char const *format2)
|
|
|
cf1fd2 |
else if (force_sync)
|
|
|
cf1fd2 |
flags |= AT_STATX_FORCE_SYNC;
|
|
|
cf1fd2 |
|
|
|
cf1fd2 |
+ if (! force_sync)
|
|
|
cf1fd2 |
+ flags |= AT_NO_AUTOMOUNT;
|
|
|
cf1fd2 |
+
|
|
|
cf1fd2 |
fd = statx (fd, pathname, flags, format_to_mask (format), &stx;;
|
|
|
cf1fd2 |
if (fd < 0)
|
|
|
cf1fd2 |
{
|
|
|
cf1fd2 |
--
|
|
|
cf1fd2 |
2.34.1
|
|
|
cf1fd2 |
|