b58878d9dd
This MR adds fixes for several Jiras. - RHEL-57466 - autofs crashes on startup after IDM client configuration We have had several different reports caused by this bug which leads to a SEGV with very little information about the cuase. - Resolves: RHEL-57466 - RHEL-69485 - Sporadic mount failures with amd program maps on RHEL8. This bug causes AMD-style program map mounts to sporadically not work. - Resolves: RHEL-69485 - RHEL-71359 - RFE: autofs: add handling for AMD 'nounmount' option This Jira adds support for a map option that was deferred in the original implementtion. One of our customers needs this so it has been implemented. - Resolves: RHEL-71359 Signed-off-by: Ian Kent <ikent@redhat.com>
134 lines
4.1 KiB
Diff
134 lines
4.1 KiB
Diff
commit a2002247e16ef60efe049e04119a9c92694cbfe1
|
|
Author: Ian Kent <raven@themaw.net>
|
|
Date: Tue Jul 9 14:59:40 2024 +0800
|
|
|
|
autofs-5.1.9 - seperate amd mount and entry flags
|
|
|
|
We are running out of flags for amd mounts, seperate the mount flags
|
|
from the defaults and entry flags and add a new amd entry flags field.
|
|
|
|
Signed-off-by: Ian Kent <raven@themaw.net>
|
|
|
|
---
|
|
CHANGELOG | 1 +
|
|
include/parse_amd.h | 11 ++++++-----
|
|
modules/amd_parse.y | 7 ++++---
|
|
modules/parse_amd.c | 10 +++++-----
|
|
4 files changed, 16 insertions(+), 13 deletions(-)
|
|
|
|
--- autofs-5.1.7.orig/CHANGELOG
|
|
+++ autofs-5.1.7/CHANGELOG
|
|
@@ -168,6 +168,7 @@
|
|
- refactor umount_amd_ext_mount().
|
|
- add flags argument to amd do_program_mount().
|
|
- fix amd cache options not copied.
|
|
+- seperate amd mount and entry flags.
|
|
|
|
25/01/2021 autofs-5.1.7
|
|
- make bind mounts propagation slave by default.
|
|
--- autofs-5.1.7.orig/include/parse_amd.h
|
|
+++ autofs-5.1.7/include/parse_amd.h
|
|
@@ -33,12 +33,12 @@
|
|
#define AMD_MOUNT_TYPE_PROGRAM 0x00004000
|
|
#define AMD_MOUNT_TYPE_MASK 0x0000ffff
|
|
|
|
-#define AMD_ENTRY_CUT 0x00010000
|
|
-#define AMD_ENTRY_MASK 0x00ff0000
|
|
+#define AMD_DEFAULTS_MERGE 0x0001
|
|
+#define AMD_DEFAULTS_RESET 0x0002
|
|
+#define AMD_DEFAULTS_MASK 0x00ff
|
|
|
|
-#define AMD_DEFAULTS_MERGE 0x01000000
|
|
-#define AMD_DEFAULTS_RESET 0x02000000
|
|
-#define AMD_DEFAULTS_MASK 0xff000000
|
|
+#define AMD_ENTRY_CUT 0x0100
|
|
+#define AMD_ENTRY_MASK 0xff00
|
|
|
|
#define AMD_CACHE_OPTION_NONE 0x0000
|
|
#define AMD_CACHE_OPTION_INC 0x0001
|
|
@@ -50,6 +50,7 @@ struct amd_entry {
|
|
char *path;
|
|
unsigned long flags;
|
|
unsigned int cache_opts;
|
|
+ unsigned int entry_flags;
|
|
char *type;
|
|
char *map_type;
|
|
char *pref;
|
|
--- autofs-5.1.7.orig/modules/amd_parse.y
|
|
+++ autofs-5.1.7/modules/amd_parse.y
|
|
@@ -155,7 +155,7 @@ location_selection_list: location
|
|
}
|
|
| location_selection_list SPACE CUT SPACE location
|
|
{
|
|
- entry.flags |= AMD_ENTRY_CUT;
|
|
+ entry.entry_flags |= AMD_ENTRY_CUT;
|
|
if (!add_location()) {
|
|
amd_msg("failed to allocate new location");
|
|
YYABORT;
|
|
@@ -168,11 +168,11 @@ location: location_entry
|
|
}
|
|
| HYPHEN location_entry
|
|
{
|
|
- entry.flags |= AMD_DEFAULTS_MERGE;
|
|
+ entry.entry_flags |= AMD_DEFAULTS_MERGE;
|
|
}
|
|
| HYPHEN
|
|
{
|
|
- entry.flags |= AMD_DEFAULTS_RESET;
|
|
+ entry.entry_flags |= AMD_DEFAULTS_RESET;
|
|
}
|
|
;
|
|
|
|
@@ -889,6 +889,7 @@ static int add_location(void)
|
|
}
|
|
new->flags = entry.flags;
|
|
new->cache_opts = entry.cache_opts;
|
|
+ new->entry_flags = entry.entry_flags;
|
|
new->type = entry.type;
|
|
new->map_type = entry.map_type;
|
|
new->pref = entry.pref;
|
|
--- autofs-5.1.7.orig/modules/parse_amd.c
|
|
+++ autofs-5.1.7/modules/parse_amd.c
|
|
@@ -2022,13 +2022,13 @@ static struct amd_entry *select_default_
|
|
|
|
p = p->next;
|
|
|
|
- if (this->flags & AMD_DEFAULTS_MERGE) {
|
|
+ if (this->entry_flags & AMD_DEFAULTS_MERGE) {
|
|
if (entry_default)
|
|
free_amd_entry(entry_default);
|
|
list_del_init(&this->list);
|
|
entry_default = this;
|
|
continue;
|
|
- } else if (this->flags & AMD_DEFAULTS_RESET) {
|
|
+ } else if (this->entry_flags & AMD_DEFAULTS_RESET) {
|
|
struct amd_entry *new;
|
|
new = dup_defaults_entry(defaults_entry);
|
|
if (new) {
|
|
@@ -2259,14 +2259,14 @@ int parse_mount(struct autofs_point *ap,
|
|
struct amd_entry *this = list_entry(p, struct amd_entry, list);
|
|
p = p->next;
|
|
|
|
- if (this->flags & AMD_DEFAULTS_MERGE) {
|
|
+ if (this->entry_flags & AMD_DEFAULTS_MERGE) {
|
|
free_amd_entry(cur_defaults);
|
|
list_del_init(&this->list);
|
|
cur_defaults = this;
|
|
update_with_defaults(defaults_entry, cur_defaults, sv);
|
|
debug(ap->logopt, "merged /defaults entry with defaults");
|
|
continue;
|
|
- } else if (this->flags & AMD_DEFAULTS_RESET) {
|
|
+ } else if (this->entry_flags & AMD_DEFAULTS_RESET) {
|
|
struct amd_entry *nd, *new;
|
|
struct substvar *nsv = NULL;
|
|
|
|
@@ -2291,7 +2291,7 @@ int parse_mount(struct autofs_point *ap,
|
|
debug(ap->logopt, "expand defaults entry");
|
|
sv = expand_entry(ap, cur_defaults, flags, sv);
|
|
|
|
- if (this->flags & AMD_ENTRY_CUT && at_least_one) {
|
|
+ if (this->entry_flags & AMD_ENTRY_CUT && at_least_one) {
|
|
info(ap->logopt, MODPREFIX
|
|
"at least one entry tried before cut selector, "
|
|
"not continuing");
|